diff --git a/src/Gui/SettingsOutgoingPage.ui b/src/Gui/SettingsOutgoingPage.ui
index e41d35f9..47c3f4ca 100644
--- a/src/Gui/SettingsOutgoingPage.ui
+++ b/src/Gui/SettingsOutgoingPage.ui
@@ -1,243 +1,246 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>OutgoingPage</class>
  <widget class="QScrollArea" name="OutgoingPage">
   <property name="frameShadow">
    <enum>QFrame::Plain</enum>
   </property>
   <property name="widgetResizable">
    <bool>true</bool>
   </property>
   <widget class="QWidget" name="scrollAreaWidgetContents">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>220</width>
      <height>347</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
     <property name="fieldGrowthPolicy">
      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
     </property>
     <item row="0" column="0">
      <widget class="QLabel" name="methodLabel">
       <property name="text">
        <string>&amp;Method</string>
       </property>
       <property name="buddy">
        <cstring>method</cstring>
       </property>
      </widget>
     </item>
     <item row="0" column="1">
      <widget class="QComboBox" name="method"/>
     </item>
     <item row="1" column="0">
      <widget class="QLabel" name="encryptionLabel">
       <property name="text">
        <string>Encryption</string>
       </property>
      </widget>
     </item>
     <item row="1" column="1">
      <widget class="QComboBox" name="encryption"/>
     </item>
     <item row="2" column="0">
      <widget class="QLabel" name="smtpHostLabel">
       <property name="text">
        <string>Ser&amp;ver</string>
       </property>
       <property name="buddy">
        <cstring>smtpHost</cstring>
       </property>
      </widget>
     </item>
     <item row="2" column="1">
      <widget class="LineEdit" name="smtpHost"/>
     </item>
     <item row="3" column="0">
      <widget class="QLabel" name="smtpPortLabel">
       <property name="text">
        <string>&amp;Port</string>
       </property>
       <property name="buddy">
        <cstring>smtpPort</cstring>
       </property>
      </widget>
     </item>
     <item row="3" column="1">
      <widget class="LineEdit" name="smtpPort"/>
     </item>
     <item row="4" column="0" colspan="2">
      <widget class="QLabel" name="portWarningLabel">
       <property name="text">
        <string/>
       </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
      </widget>
     </item>
     <item row="5" column="0">
      <widget class="QLabel" name="smtpAuthLabel">
       <property name="text">
        <string>&amp;Authenticate</string>
       </property>
       <property name="buddy">
        <cstring>smtpAuth</cstring>
       </property>
      </widget>
     </item>
     <item row="5" column="1">
      <widget class="QCheckBox" name="smtpAuth">
       <property name="text">
        <string/>
       </property>
      </widget>
     </item>
     <item row="7" column="0">
      <widget class="QLabel" name="smtpUserLabel">
       <property name="text">
        <string>&amp;Username</string>
       </property>
       <property name="buddy">
        <cstring>smtpUser</cstring>
       </property>
      </widget>
     </item>
     <item row="7" column="1">
      <widget class="LineEdit" name="smtpUser"/>
     </item>
     <item row="9" column="0">
      <widget class="QLabel" name="smtpPassLabel">
       <property name="text">
        <string>Pass&amp;word</string>
       </property>
       <property name="buddy">
        <cstring>smtpPass</cstring>
       </property>
      </widget>
     </item>
     <item row="9" column="1">
      <widget class="LineEdit" name="smtpPass">
       <property name="echoMode">
        <enum>QLineEdit::Password</enum>
       </property>
      </widget>
     </item>
     <item row="10" column="0" colspan="2">
      <widget class="QLabel" name="passwordWarning">
       <property name="wordWrap">
        <bool>true</bool>
       </property>
      </widget>
     </item>
     <item row="11" column="0" colspan="2">
      <widget class="QLabel" name="passwordPluginStatus">
       <property name="text">
        <string notr="true">plugin status</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignCenter</set>
       </property>
       <property name="wordWrap">
        <bool>true</bool>
       </property>
       <property name="textInteractionFlags">
        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
       </property>
      </widget>
     </item>
     <item row="12" column="0">
      <widget class="QLabel" name="sendmailLabel">
       <property name="text">
        <string>Sendmail E&amp;xecutable</string>
       </property>
       <property name="buddy">
        <cstring>sendmail</cstring>
       </property>
      </widget>
     </item>
     <item row="12" column="1">
      <widget class="LineEdit" name="sendmail"/>
     </item>
     <item row="13" column="0">
      <widget class="QLabel" name="saveToImapLabel">
       <property name="text">
        <string>Save Ou&amp;tgoing Mail</string>
       </property>
       <property name="buddy">
        <cstring>saveToImap</cstring>
       </property>
      </widget>
     </item>
     <item row="13" column="1">
      <widget class="QCheckBox" name="saveToImap"/>
     </item>
     <item row="14" column="0">
      <widget class="QLabel" name="saveFolderLabel">
       <property name="text">
        <string>Sent Folder &amp;Name</string>
       </property>
       <property name="buddy">
        <cstring>saveFolderName</cstring>
       </property>
      </widget>
     </item>
     <item row="14" column="1">
      <widget class="LineEdit" name="saveFolderName"/>
     </item>
     <item row="15" column="0">
      <widget class="QLabel" name="smtpBurlLabel">
       <property name="toolTip">
        <string>Enable forward-without-download via BURL (RFC 4468) when the IMAP and ESMTP servers support it. Extra server-side configuration is required.</string>
       </property>
       <property name="text">
        <string>Send with &amp;BURL</string>
       </property>
       <property name="buddy">
        <cstring>smtpBurl</cstring>
       </property>
      </widget>
     </item>
     <item row="15" column="1">
      <widget class="QCheckBox" name="smtpBurl"/>
     </item>
     <item row="6" column="1">
      <widget class="QCheckBox" name="smtpAuthReuseImapCreds">
       <property name="text">
        <string/>
       </property>
      </widget>
     </item>
     <item row="6" column="0">
      <widget class="QLabel" name="smtpAuthReuseImapCredsLabel">
       <property name="text">
        <string>Use IMAP Credentials</string>
       </property>
      </widget>
     </item>
    </layout>
   </widget>
  </widget>
  <customwidgets>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
    <header>LineEdit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>method</tabstop>
   <tabstop>smtpHost</tabstop>
   <tabstop>smtpPort</tabstop>
   <tabstop>smtpAuth</tabstop>
   <tabstop>smtpUser</tabstop>
   <tabstop>smtpPass</tabstop>
   <tabstop>sendmail</tabstop>
   <tabstop>saveToImap</tabstop>
   <tabstop>saveFolderName</tabstop>
   <tabstop>smtpBurl</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>