diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py
index 397937dc78..e2015dc380 100644
--- a/src/calibre/gui2/convert/look_and_feel.py
+++ b/src/calibre/gui2/convert/look_and_feel.py
@@ -21,7 +21,7 @@ class LookAndFeelWidget(Widget, Ui_Form):
                 ['dont_justify', 'extra_css', 'base_font_size',
                     'font_size_mapping', 'insert_metadata', 'line_height',
                     'linearize_tables', 'remove_first_image',
-                    'remove_paragraph_spacing']
+                    'remove_paragraph_spacing', 'input_encoding']
                 )
         self.db, self.book_id = db, book_id
         self.initialize_options(get_option, get_help, db, book_id)
diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui
index 302ca13776..c6a1a715a6 100644
--- a/src/calibre/gui2/convert/look_and_feel.ui
+++ b/src/calibre/gui2/convert/look_and_feel.ui
@@ -68,28 +68,28 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0" colspan="2">
+     <item row="4" column="0" colspan="2">
       <widget class="QCheckBox" name="opt_remove_paragraph_spacing">
        <property name="text">
         <string>Remove &amp;spacing between paragraphs</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="0" colspan="2">
+     <item row="5" column="0" colspan="2">
       <widget class="QCheckBox" name="opt_dont_justify">
        <property name="text">
         <string>No text &amp;justification</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0" colspan="2">
+     <item row="6" column="0" colspan="2">
       <widget class="QCheckBox" name="opt_linearize_tables">
        <property name="text">
         <string>&amp;Linearize tables</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="0" colspan="2">
+     <item row="7" column="0" colspan="2">
       <widget class="QCheckBox" name="opt_remove_first_image">
        <property name="text">
         <string>Remove &amp;first image from source file</string>
@@ -109,13 +109,26 @@
      <item row="1" column="1" colspan="2">
       <widget class="QLineEdit" name="opt_font_size_mapping"/>
      </item>
-     <item row="7" column="0" colspan="2">
+     <item row="8" column="0" colspan="2">
       <widget class="QCheckBox" name="opt_insert_metadata">
        <property name="text">
         <string>Insert &amp;metadata at start of book</string>
        </property>
       </widget>
      </item>
+     <item row="3" column="0" colspan="2">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Input character &amp;encoding</string>
+       </property>
+       <property name="buddy">
+        <cstring>opt_input_encoding</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QLineEdit" name="opt_input_encoding"/>
+     </item>
     </layout>
    </item>
    <item>
diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py
index faa8ebcf83..4d3f023a4c 100644
--- a/src/calibre/gui2/convert/single.py
+++ b/src/calibre/gui2/convert/single.py
@@ -92,7 +92,7 @@ class Config(ResizableDialog, Ui_Dialog):
                 self.show_pane)
         self.connect(self.groups, SIGNAL('clicked(QModelIndex)'),
                 self.show_pane)
-        self.connect(self.groups, SIGNAL('itemEntered(QModelIndex)'),
+        self.connect(self.groups, SIGNAL('entered(QModelIndex)'),
                 self.show_group_help)
         self.groups.setMouseTracking(True)