diff --git a/src/calibre/ebooks/mobi/output.py b/src/calibre/ebooks/mobi/output.py
index 84860d3d0f..4c272f75d1 100644
--- a/src/calibre/ebooks/mobi/output.py
+++ b/src/calibre/ebooks/mobi/output.py
@@ -24,6 +24,10 @@ class MOBIOutput(OutputFormatPlugin):
             recommended_value=False, level=OptionRecommendation.LOW,
             help=_('When present, use author sort field as author.')
         ),
+        OptionRecommendation(name='no_inline_toc',
+            recommended_value=False, level=OptionRecommendation.LOW,
+            help=_('Don\'t add Table of Contents to end of book. Useful if '
+                'the book has its own table of contents.')),
         OptionRecommendation(name='toc_title', recommended_value=None,
             help=_('Title for any generated in-line table of contents.')
         ),
@@ -35,8 +39,6 @@ class MOBIOutput(OutputFormatPlugin):
             recommended_value=False, level=OptionRecommendation.LOW,
             help=_('Disable compression of the file contents.')
         ),
-
-
     ])
 
     def convert(self, oeb, output_path, input_plugin, opts, log):
@@ -49,8 +51,9 @@ def convert(self, oeb, output_path, input_plugin, opts, log):
         from calibre.ebooks.oeb.transforms.htmltoc import HTMLTOCAdder
         from calibre.customize.ui import plugin_for_input_format
         imagemax = PALM_MAX_IMAGE_SIZE if opts.rescale_images else None
-        tocadder = HTMLTOCAdder(title=opts.toc_title)
-        tocadder(oeb, opts)
+        if not opts.no_inline_toc:
+            tocadder = HTMLTOCAdder(title=opts.toc_title)
+            tocadder(oeb, opts)
         mangler = CaseMangler()
         mangler(oeb, opts)
         rasterizer = SVGRasterizer()
@@ -58,7 +61,6 @@ def convert(self, oeb, output_path, input_plugin, opts, log):
         mobimlizer = MobiMLizer(ignore_tables=opts.linearize_tables)
         mobimlizer(oeb, opts)
         write_page_breaks_after_item = not input_plugin is plugin_for_input_format('cbz')
-        print 111111, write_page_breaks_after_item
         writer = MobiWriter(opts, imagemax=imagemax,
                 compression=UNCOMPRESSED if opts.dont_compress else PALMDOC,
                             prefer_author_sort=opts.prefer_author_sort,
diff --git a/src/calibre/gui2/convert/mobi_output.ui b/src/calibre/gui2/convert/mobi_output.ui
index bc1cd45714..8bd205e9dd 100644
--- a/src/calibre/gui2/convert/mobi_output.ui
+++ b/src/calibre/gui2/convert/mobi_output.ui
@@ -14,7 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>&amp;Title for Table of Contents:</string>
@@ -24,24 +24,24 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="1" column="1">
     <widget class="QLineEdit" name="opt_toc_title"/>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="2" column="0" colspan="2">
     <widget class="QCheckBox" name="opt_rescale_images">
      <property name="text">
       <string>Rescale images for &amp;Palm devices</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="3" column="0" colspan="2">
     <widget class="QCheckBox" name="opt_prefer_author_sort">
      <property name="text">
       <string>Use author &amp;sort for author</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -54,20 +54,27 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QCheckBox" name="opt_dont_compress">
      <property name="text">
       <string>Disable compression of the file contents</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QCheckBox" name="opt_mobi_periodical">
      <property name="text">
       <string>Generate a periodical rather than a book</string>
      </property>
     </widget>
    </item>
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="opt_no_inline_toc">
+     <property name="text">
+      <string>Do not add Table of Contents to book</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>