diff --git a/src/calibre/gui2/preferences/email.ui b/src/calibre/gui2/preferences/email.ui
index 3ed95d0f66..76d21693f9 100644
--- a/src/calibre/gui2/preferences/email.ui
+++ b/src/calibre/gui2/preferences/email.ui
@@ -40,6 +40,12 @@
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <item>
         <widget class="QToolButton" name="email_add">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="toolTip">
           <string>Add an email address to which to send books</string>
          </property>
@@ -63,6 +69,12 @@
        </item>
        <item>
         <widget class="QPushButton" name="email_make_default">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Make &amp;default</string>
          </property>
@@ -70,6 +82,12 @@
        </item>
        <item>
         <widget class="QToolButton" name="email_remove">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>&amp;Remove email</string>
          </property>
diff --git a/src/calibre/gui2/wizard/send_email.ui b/src/calibre/gui2/wizard/send_email.ui
index 0e89e94ac3..d3c51709a8 100644
--- a/src/calibre/gui2/wizard/send_email.ui
+++ b/src/calibre/gui2/wizard/send_email.ui
@@ -148,7 +148,7 @@
       <item row="4" column="0">
        <widget class="QLabel" name="label_21">
         <property name="text">
-         <string>&amp;Encryption:</string>
+         <string>Encr&amp;yption:</string>
         </property>
         <property name="buddy">
          <cstring>relay_tls</cstring>
@@ -174,7 +174,7 @@
          <string>Use SSL encryption when connecting to the mail server.</string>
         </property>
         <property name="text">
-         <string>&amp;SSL</string>
+         <string>SS&amp;L</string>
         </property>
        </widget>
       </item>
@@ -208,6 +208,12 @@
     <layout class="QVBoxLayout" name="verticalLayout_9">
      <item>
       <widget class="QToolButton" name="relay_use_gmx">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Use &amp;GMX</string>
        </property>
@@ -228,6 +234,12 @@
      </item>
      <item>
       <widget class="QToolButton" name="relay_use_hotmail">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Use &amp;Hotmail</string>
        </property>