diff --git a/src/calibre/gui2/preferences/save_template.py b/src/calibre/gui2/preferences/save_template.py
index ceb9f1c8e9..608183b416 100644
--- a/src/calibre/gui2/preferences/save_template.py
+++ b/src/calibre/gui2/preferences/save_template.py
@@ -23,9 +23,14 @@ class SaveTemplate(QWidget, Ui_Form):
         QWidget.__init__(self, *args)
         Ui_Form.__init__(self)
         self.setupUi(self)
+        self.orig_help_text = self.help_label.text()
 
     def initialize(self, name, default, help, field_metadata):
         variables = sorted(FORMAT_ARG_DESCS.keys())
+        if name == 'send_to_device':
+            self.help_label.setText(self.orig_help_text + _(
+                '. This setting can be overridden for <b>individual devices</b>,'
+                ' by clicking the device icon and choosing "Configure this device".'))
         rows = []
         for var in variables:
             rows.append(u'<tr><td>%s</td><td>&nbsp;</td><td>%s</td></tr>'%
@@ -50,7 +55,6 @@ class SaveTemplate(QWidget, Ui_Form):
         if t.exec_():
             self.opt_template.set_value(t.rule[1])
 
-
     def changed(self, *args):
         self.changed_signal.emit()
 
@@ -69,7 +73,7 @@ class SaveTemplate(QWidget, Ui_Form):
                       'books will have the same name. Is this OK?'))
         except Exception as err:
             error_dialog(self, _('Invalid template'),
-                    '<p>'+_('The template %s is invalid:')%tmpl + \
+                    '<p>'+_('The template %s is invalid:')%tmpl +
                     '<br>'+str(err), show=True)
             return False
         return True
@@ -81,8 +85,3 @@ class SaveTemplate(QWidget, Ui_Form):
         val = unicode(self.opt_template.text())
         config.set(name, val)
         self.opt_template.save_history(self.option_name+'_template_history')
-
-
-
-
-
diff --git a/src/calibre/gui2/preferences/save_template.ui b/src/calibre/gui2/preferences/save_template.ui
index 98515e8377..6f10a4c68f 100644
--- a/src/calibre/gui2/preferences/save_template.ui
+++ b/src/calibre/gui2/preferences/save_template.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>477</width>
     <height>300</height>
    </rect>
   </property>
@@ -21,7 +21,7 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="label_4">
+       <widget class="QLabel" name="help_label">
         <property name="text">
          <string>By adjusting the template below, you can control what folders the files are saved in and what filenames they are given. You can use the / character to indicate sub-folders. Available metadata variables are described below. If a particular book does not have some metadata, the variable will be replaced by the empty string.</string>
         </property>
diff --git a/src/calibre/gui2/preferences/sending.ui b/src/calibre/gui2/preferences/sending.ui
index 606934329e..7e6c3c011d 100644
--- a/src/calibre/gui2/preferences/sending.ui
+++ b/src/calibre/gui2/preferences/sending.ui
@@ -23,7 +23,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Metadata &amp;management:</string>
+      <string>Me&amp;tadata management:</string>
      </property>
      <property name="buddy">
       <cstring>opt_manage_device_metadata</cstring>
@@ -94,16 +94,6 @@
     <widget class="QLineEdit" name="opt_send_timefmt"/>
    </item>
    <item row="3" column="0" colspan="3">
-    <widget class="QLabel" name="label_43">
-     <property name="text">
-      <string>Here you can control how calibre will save your books when you click the Send to Device button. This setting can be overriden for individual devices by customizing the device interface plugins in Preferences-&gt;Advanced-&gt;Plugins</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="3">
     <widget class="SaveTemplate" name="send_template" native="true"/>
    </item>
   </layout>