IOS-379 Fixed
authorigor <igor@pep-project.org>
Thu, 12 Jan 2017 15:14:02 +0100
changeset 1408d4f3ec47c2c7
parent 1407 538496ac0905
child 1409 e2b3b8973106
IOS-379 Fixed
pEpForiOS.xcodeproj/project.pbxproj
pEpForiOS/Base.lproj/Localizable.strings
pEpForiOS/Base.lproj/Main.storyboard
pEpForiOS/UI/AccountsAndFolders/AccountsTableViewController.swift
pEpForiOS/UI/EmailDisplay/EmailListViewController.swift
pEpForiOS/UI/ImapSetup/IMAPSettingsTableView.swift
pEpForiOS/UI/ImapSetup/SMTPSettingsTableView.swift
pEpForiOS/UI/ImapSetup/UserInfoTableView.swift
pEpForiOS/en.lproj/Localizable.strings
     1.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Thu Jan 12 13:21:38 2017 +0100
     1.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Thu Jan 12 15:14:02 2017 +0100
     1.3 @@ -874,11 +874,11 @@
     1.4  			isa = PBXGroup;
     1.5  			children = (
     1.6  				43C32E201DBF94A6007CFB1A /* MockData.swift */,
     1.7 +				43ED53621CC77F95006AB156 /* EmailDisplay */,
     1.8  				43001F761D9185E600306BF0 /* TableViews */,
     1.9  				431B0B961D6734BF0082D0DB /* AccountsSettings */,
    1.10  				4327221F1D33F2CB009EC395 /* Trustwords */,
    1.11  				431AE5D11D2EC0A700F609D3 /* Compose */,
    1.12 -				43ED53621CC77F95006AB156 /* EmailDisplay */,
    1.13  				43ED53651CC77F95006AB156 /* ImapSetup */,
    1.14  			);
    1.15  			path = UI;
     2.1 --- a/pEpForiOS/Base.lproj/Localizable.strings	Thu Jan 12 13:21:38 2017 +0100
     2.2 +++ b/pEpForiOS/Base.lproj/Localizable.strings	Thu Jan 12 15:14:02 2017 +0100
     2.3 @@ -26,12 +26,16 @@
     2.4  "MenuCtrl.Cameraroll" = "Foto od. Video einf├╝gen";
     2.5  "MenuCtrl.Attachment" = "Anhang hinzuf├╝gen";
     2.6  
     2.7 -// Account List
     2.8 -
     2.9 -"Accounts.HeaderTitle" = "Accounts";
    2.10 -
    2.11  // Account Settings
    2.12  
    2.13  "AccountsSettings.Account" = "Account";
    2.14  "AccountsSettings.IMAP" = "IMAP Settings";
    2.15  "AccountsSettings.SMTP" = "SMTP Settings";
    2.16 +
    2.17 +// titles strings
    2.18 +
    2.19 +"EmailList.title" = "Inbox";
    2.20 +"Accounts.title" = "Accounts";
    2.21 +"NewAccount.title" = "New Account"; 
    2.22 +"ImapSettings.title" = "IMAP Settings";
    2.23 +"SmtpSettings.title" = "SMTP Settings";
     3.1 --- a/pEpForiOS/Base.lproj/Main.storyboard	Thu Jan 12 13:21:38 2017 +0100
     3.2 +++ b/pEpForiOS/Base.lproj/Main.storyboard	Thu Jan 12 15:14:02 2017 +0100
     3.3 @@ -23,7 +23,7 @@
     3.4                                  <rect key="frame" x="0.0" y="28" width="375" height="100"/>
     3.5                                  <autoresizingMask key="autoresizingMask"/>
     3.6                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uhL-VL-48i" id="jgQ-nZ-h1r">
     3.7 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
     3.8 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
     3.9                                      <autoresizingMask key="autoresizingMask"/>
    3.10                                      <subviews>
    3.11                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="1000" text="Sender" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tWZ-jW-sUg">
    3.12 @@ -130,7 +130,7 @@
    3.13                              </connections>
    3.14                          </barButtonItem>
    3.15                      </toolbarItems>
    3.16 -                    <navigationItem key="navigationItem" id="bgm-ua-A0f">
    3.17 +                    <navigationItem key="navigationItem" title="Inbox" id="bgm-ua-A0f">
    3.18                          <barButtonItem key="leftBarButtonItem" title="Accounts" id="1rc-mQ-T0F">
    3.19                              <connections>
    3.20                                  <segue destination="C7k-Jh-fNo" kind="presentation" identifier="" id="ryT-n1-8hT"/>
    3.21 @@ -167,7 +167,7 @@
    3.22                                  <rect key="frame" x="0.0" y="28" width="375" height="58"/>
    3.23                                  <autoresizingMask key="autoresizingMask"/>
    3.24                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Epo-ru-S9d" id="KqB-b6-IoI">
    3.25 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="57"/>
    3.26 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="58"/>
    3.27                                      <autoresizingMask key="autoresizingMask"/>
    3.28                                      <subviews>
    3.29                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lwf-Sw-cKo">
    3.30 @@ -215,7 +215,7 @@
    3.31                                  <rect key="frame" x="0.0" y="86" width="375" height="58"/>
    3.32                                  <autoresizingMask key="autoresizingMask"/>
    3.33                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BXJ-Ko-ZUm" id="Pc9-7u-OeC">
    3.34 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="57"/>
    3.35 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="58"/>
    3.36                                      <autoresizingMask key="autoresizingMask"/>
    3.37                                      <subviews>
    3.38                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DWr-lq-DOL">
    3.39 @@ -252,7 +252,7 @@
    3.40                                  <rect key="frame" x="0.0" y="144" width="375" height="260"/>
    3.41                                  <autoresizingMask key="autoresizingMask"/>
    3.42                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xhW-oS-ri3" id="doY-9c-uKA">
    3.43 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="259"/>
    3.44 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="260"/>
    3.45                                      <autoresizingMask key="autoresizingMask"/>
    3.46                                      <subviews>
    3.47                                          <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="bVM-o9-45O" customClass="ComposeTextView" customModule="pEpForiOS" customModuleProvider="target">
    3.48 @@ -280,7 +280,7 @@
    3.49                                  <rect key="frame" x="0.0" y="404" width="375" height="190"/>
    3.50                                  <autoresizingMask key="autoresizingMask"/>
    3.51                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="prY-xp-1rI" id="FU0-SW-FOj">
    3.52 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="189"/>
    3.53 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="190"/>
    3.54                                      <autoresizingMask key="autoresizingMask"/>
    3.55                                      <subviews>
    3.56                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U2j-jK-hcO">
    3.57 @@ -354,7 +354,7 @@
    3.58              </objects>
    3.59              <point key="canvasLocation" x="5990" y="1182"/>
    3.60          </scene>
    3.61 -        <!--New Account-->
    3.62 +        <!--User Info Table View-->
    3.63          <scene sceneID="hJo-oO-Yib">
    3.64              <objects>
    3.65                  <tableViewController storyboardIdentifier="UserInfoTableView" id="YcO-Oc-XZx" customClass="UserInfoTableView" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
    3.66 @@ -369,7 +369,7 @@
    3.67                                          <rect key="frame" x="0.0" y="35" width="375" height="49"/>
    3.68                                          <autoresizingMask key="autoresizingMask"/>
    3.69                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ixi-Mt-3kg" id="wqB-dm-pDx">
    3.70 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
    3.71 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
    3.72                                              <autoresizingMask key="autoresizingMask"/>
    3.73                                              <subviews>
    3.74                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hUQ-RI-kfE">
    3.75 @@ -405,7 +405,7 @@
    3.76                                          <rect key="frame" x="0.0" y="84" width="375" height="49"/>
    3.77                                          <autoresizingMask key="autoresizingMask"/>
    3.78                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Muc-p7-eLR" id="ALh-ce-psL">
    3.79 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
    3.80 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
    3.81                                              <autoresizingMask key="autoresizingMask"/>
    3.82                                              <subviews>
    3.83                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SCr-eb-mdn">
    3.84 @@ -441,7 +441,7 @@
    3.85                                          <rect key="frame" x="0.0" y="133" width="375" height="49"/>
    3.86                                          <autoresizingMask key="autoresizingMask"/>
    3.87                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wzw-Ix-clS" id="iw0-fF-fSh">
    3.88 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
    3.89 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
    3.90                                              <autoresizingMask key="autoresizingMask"/>
    3.91                                              <subviews>
    3.92                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3ti-b6-5l8">
    3.93 @@ -480,7 +480,7 @@
    3.94                                          <rect key="frame" x="0.0" y="182" width="375" height="49"/>
    3.95                                          <autoresizingMask key="autoresizingMask"/>
    3.96                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="x9C-Hc-Hvk" id="Tc7-0e-d7T">
    3.97 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
    3.98 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
    3.99                                              <autoresizingMask key="autoresizingMask"/>
   3.100                                              <subviews>
   3.101                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xbE-mW-hjW">
   3.102 @@ -525,7 +525,7 @@
   3.103                          </connections>
   3.104                      </tableView>
   3.105                      <toolbarItems/>
   3.106 -                    <navigationItem key="navigationItem" title="New Account" id="QS1-DH-6Lg">
   3.107 +                    <navigationItem key="navigationItem" id="QS1-DH-6Lg">
   3.108                          <barButtonItem key="leftBarButtonItem" id="93D-9e-gLu">
   3.109                              <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="cUk-RH-Yos">
   3.110                                  <rect key="frame" x="16" y="7" width="83" height="30"/>
   3.111 @@ -572,7 +572,7 @@
   3.112                                  <rect key="frame" x="0.0" y="28" width="375" height="44"/>
   3.113                                  <autoresizingMask key="autoresizingMask"/>
   3.114                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9jg-K9-g2Q" id="Wky-08-VfS">
   3.115 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.116 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.117                                      <autoresizingMask key="autoresizingMask"/>
   3.118                                      <subviews>
   3.119                                          <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Security tittle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x1d-Md-75b">
   3.120 @@ -623,7 +623,7 @@
   3.121                                  <rect key="frame" x="0.0" y="72" width="375" height="44"/>
   3.122                                  <autoresizingMask key="autoresizingMask"/>
   3.123                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sQl-io-CjQ" id="rRf-0n-OEF">
   3.124 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.125 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.126                                      <autoresizingMask key="autoresizingMask"/>
   3.127                                      <subviews>
   3.128                                          <textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" usesAttributedText="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ges-7V-rhw">
   3.129 @@ -658,7 +658,7 @@
   3.130                                  <rect key="frame" x="0.0" y="116" width="375" height="44"/>
   3.131                                  <autoresizingMask key="autoresizingMask"/>
   3.132                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NUY-Vz-tpg" id="Aqd-T5-1MR">
   3.133 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.134 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.135                                      <autoresizingMask key="autoresizingMask"/>
   3.136                                      <subviews>
   3.137                                          <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="irB-0r-1CK">
   3.138 @@ -741,7 +741,7 @@
   3.139                                  <rect key="frame" x="0.0" y="28" width="375" height="44"/>
   3.140                                  <autoresizingMask key="autoresizingMask"/>
   3.141                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TEd-c8-lcR" id="iTO-wm-jHy">
   3.142 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.143 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.144                                      <autoresizingMask key="autoresizingMask"/>
   3.145                                      <subviews>
   3.146                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vMR-75-Xgn">
   3.147 @@ -764,7 +764,7 @@
   3.148                                  <rect key="frame" x="0.0" y="72" width="375" height="44"/>
   3.149                                  <autoresizingMask key="autoresizingMask"/>
   3.150                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CaC-tZ-Vd5" id="dqb-4y-aM1">
   3.151 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.152 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.153                                      <autoresizingMask key="autoresizingMask"/>
   3.154                                      <subviews>
   3.155                                          <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="TextView" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rC4-w0-03O">
   3.156 @@ -790,7 +790,7 @@
   3.157                                  <rect key="frame" x="0.0" y="116" width="375" height="44"/>
   3.158                                  <autoresizingMask key="autoresizingMask"/>
   3.159                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="p7C-sA-VWH" id="exZ-9t-tMI">
   3.160 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.161 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.162                                      <autoresizingMask key="autoresizingMask"/>
   3.163                                      <subviews>
   3.164                                          <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Di1-jI-BSU">
   3.165 @@ -875,7 +875,7 @@
   3.166                                          <rect key="frame" x="0.0" y="35" width="375" height="49"/>
   3.167                                          <autoresizingMask key="autoresizingMask"/>
   3.168                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yEs-RC-FK5" id="Kbm-32-bnt">
   3.169 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
   3.170 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.171                                              <autoresizingMask key="autoresizingMask"/>
   3.172                                              <subviews>
   3.173                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TQX-jQ-6wQ">
   3.174 @@ -911,7 +911,7 @@
   3.175                                          <rect key="frame" x="0.0" y="84" width="375" height="49"/>
   3.176                                          <autoresizingMask key="autoresizingMask"/>
   3.177                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xpq-Fu-Dd3" id="Luz-CL-ptS">
   3.178 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
   3.179 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.180                                              <autoresizingMask key="autoresizingMask"/>
   3.181                                              <subviews>
   3.182                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="miu-ep-BRp">
   3.183 @@ -947,7 +947,7 @@
   3.184                                          <rect key="frame" x="0.0" y="133" width="375" height="49"/>
   3.185                                          <autoresizingMask key="autoresizingMask"/>
   3.186                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="057-Jd-AD3" id="VC6-Uj-uQb">
   3.187 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
   3.188 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.189                                              <autoresizingMask key="autoresizingMask"/>
   3.190                                              <subviews>
   3.191                                                  <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H6H-wM-1tb">
   3.192 @@ -1033,7 +1033,7 @@
   3.193                                          <rect key="frame" x="0.0" y="35" width="375" height="49"/>
   3.194                                          <autoresizingMask key="autoresizingMask"/>
   3.195                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6kU-ew-kCV" id="eXm-f1-cNo">
   3.196 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
   3.197 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.198                                              <autoresizingMask key="autoresizingMask"/>
   3.199                                              <subviews>
   3.200                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VW4-JJ-HKV">
   3.201 @@ -1069,7 +1069,7 @@
   3.202                                          <rect key="frame" x="0.0" y="84" width="375" height="49"/>
   3.203                                          <autoresizingMask key="autoresizingMask"/>
   3.204                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XL7-h6-uwJ" id="e4c-NT-9NK">
   3.205 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
   3.206 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.207                                              <autoresizingMask key="autoresizingMask"/>
   3.208                                              <subviews>
   3.209                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N1c-o2-ebQ">
   3.210 @@ -1105,7 +1105,7 @@
   3.211                                          <rect key="frame" x="0.0" y="133" width="375" height="49"/>
   3.212                                          <autoresizingMask key="autoresizingMask"/>
   3.213                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xIb-rc-iWj" id="mpo-zI-aeT">
   3.214 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
   3.215 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.216                                              <autoresizingMask key="autoresizingMask"/>
   3.217                                              <subviews>
   3.218                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TransportSecurity" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HKb-4V-2g6">
   3.219 @@ -1184,7 +1184,7 @@
   3.220                                  <rect key="frame" x="0.0" y="56" width="375" height="44"/>
   3.221                                  <autoresizingMask key="autoresizingMask"/>
   3.222                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="03J-Ut-4Ls" id="dVc-Gs-baq">
   3.223 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.224 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.225                                      <autoresizingMask key="autoresizingMask"/>
   3.226                                  </tableViewCellContentView>
   3.227                              </tableViewCell>
   3.228 @@ -1233,7 +1233,7 @@
   3.229                                          <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.230                                          <autoresizingMask key="autoresizingMask"/>
   3.231                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LUk-Qy-gDE" id="sNt-IF-jUh">
   3.232 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.233 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.234                                              <autoresizingMask key="autoresizingMask"/>
   3.235                                              <subviews>
   3.236                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QcW-va-Qh4">
   3.237 @@ -1263,7 +1263,7 @@
   3.238                                          <rect key="frame" x="0.0" y="44" width="375" height="44"/>
   3.239                                          <autoresizingMask key="autoresizingMask"/>
   3.240                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SCL-dZ-lKy" id="eNg-Rw-EgK">
   3.241 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.242 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.243                                              <autoresizingMask key="autoresizingMask"/>
   3.244                                              <subviews>
   3.245                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ne5-6o-O4F">
   3.246 @@ -1293,7 +1293,7 @@
   3.247                                          <rect key="frame" x="0.0" y="88" width="375" height="44"/>
   3.248                                          <autoresizingMask key="autoresizingMask"/>
   3.249                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="heV-dy-ZLw" id="uzW-37-XhV">
   3.250 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.251 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.252                                              <autoresizingMask key="autoresizingMask"/>
   3.253                                              <subviews>
   3.254                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YGG-ns-Pes">
   3.255 @@ -1323,7 +1323,7 @@
   3.256                                          <rect key="frame" x="0.0" y="132" width="375" height="44"/>
   3.257                                          <autoresizingMask key="autoresizingMask"/>
   3.258                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ha3-pb-H6q" id="EaS-It-0GM">
   3.259 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.260 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.261                                              <autoresizingMask key="autoresizingMask"/>
   3.262                                              <subviews>
   3.263                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="En6-h6-xZD">
   3.264 @@ -1357,7 +1357,7 @@
   3.265                                          <rect key="frame" x="0.0" y="176" width="375" height="44"/>
   3.266                                          <autoresizingMask key="autoresizingMask"/>
   3.267                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Cc3-aU-8MV" id="VDT-D7-V0v">
   3.268 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.269 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.270                                              <autoresizingMask key="autoresizingMask"/>
   3.271                                              <subviews>
   3.272                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Server:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="weI-Bw-0PK">
   3.273 @@ -1387,7 +1387,7 @@
   3.274                                          <rect key="frame" x="0.0" y="220" width="375" height="44"/>
   3.275                                          <autoresizingMask key="autoresizingMask"/>
   3.276                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4xD-xp-8G4" id="c2f-YG-9nA">
   3.277 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.278 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.279                                              <autoresizingMask key="autoresizingMask"/>
   3.280                                              <subviews>
   3.281                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zDb-ax-ng4">
   3.282 @@ -1417,7 +1417,7 @@
   3.283                                          <rect key="frame" x="0.0" y="264" width="375" height="44"/>
   3.284                                          <autoresizingMask key="autoresizingMask"/>
   3.285                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YSq-Sp-yAE" id="atq-ig-qWw">
   3.286 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.287 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.288                                              <autoresizingMask key="autoresizingMask"/>
   3.289                                              <subviews>
   3.290                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TransportSecurity:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="daw-LF-EZF">
   3.291 @@ -1451,7 +1451,7 @@
   3.292                                          <rect key="frame" x="0.0" y="308" width="375" height="44"/>
   3.293                                          <autoresizingMask key="autoresizingMask"/>
   3.294                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uQq-jB-jvC" id="oxu-Hi-Kpi">
   3.295 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.296 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.297                                              <autoresizingMask key="autoresizingMask"/>
   3.298                                              <subviews>
   3.299                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Server:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DQ0-sB-CRx">
   3.300 @@ -1481,7 +1481,7 @@
   3.301                                          <rect key="frame" x="0.0" y="352" width="375" height="44"/>
   3.302                                          <autoresizingMask key="autoresizingMask"/>
   3.303                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ok-CC-12G" id="a25-Mi-BL5">
   3.304 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.305 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.306                                              <autoresizingMask key="autoresizingMask"/>
   3.307                                              <subviews>
   3.308                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vdb-LS-4JH">
   3.309 @@ -1511,7 +1511,7 @@
   3.310                                          <rect key="frame" x="0.0" y="396" width="375" height="44"/>
   3.311                                          <autoresizingMask key="autoresizingMask"/>
   3.312                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qam-JB-sRf" id="Cae-Xt-xQe">
   3.313 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.314 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.315                                              <autoresizingMask key="autoresizingMask"/>
   3.316                                              <subviews>
   3.317                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TransportSecurity:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAL-c1-ngD">
   3.318 @@ -1617,7 +1617,7 @@
   3.319                                  <rect key="frame" x="0.0" y="28" width="375" height="50"/>
   3.320                                  <autoresizingMask key="autoresizingMask"/>
   3.321                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ilb-cY-EMj" id="rLG-jZ-OQD">
   3.322 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.323 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
   3.324                                      <autoresizingMask key="autoresizingMask"/>
   3.325                                      <subviews>
   3.326                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KgX-uf-geh">
   3.327 @@ -1706,7 +1706,7 @@
   3.328                                  <rect key="frame" x="0.0" y="28" width="375" height="44"/>
   3.329                                  <autoresizingMask key="autoresizingMask"/>
   3.330                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LTA-au-2nY" id="UIH-Pp-AmH">
   3.331 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
   3.332 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   3.333                                      <autoresizingMask key="autoresizingMask"/>
   3.334                                  </tableViewCellContentView>
   3.335                              </tableViewCell>
   3.336 @@ -1714,7 +1714,7 @@
   3.337                                  <rect key="frame" x="0.0" y="72" width="375" height="50"/>
   3.338                                  <autoresizingMask key="autoresizingMask"/>
   3.339                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hir-dS-fkg" id="0v8-u0-Fch">
   3.340 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
   3.341 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
   3.342                                      <autoresizingMask key="autoresizingMask"/>
   3.343                                      <subviews>
   3.344                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Diese E-Mail ist von einer Mailing-Liste." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BjL-CL-0Cu">
   3.345 @@ -1741,7 +1741,7 @@
   3.346                                  <rect key="frame" x="0.0" y="122" width="375" height="72"/>
   3.347                                  <autoresizingMask key="autoresizingMask"/>
   3.348                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kFd-Le-QvU" id="dlZ-8o-1iE">
   3.349 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="71"/>
   3.350 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="72"/>
   3.351                                      <autoresizingMask key="autoresizingMask"/>
   3.352                                      <subviews>
   3.353                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To: Recipients" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-AS-hpP">
   3.354 @@ -1785,7 +1785,7 @@
   3.355                                  <rect key="frame" x="0.0" y="194" width="375" height="72"/>
   3.356                                  <autoresizingMask key="autoresizingMask"/>
   3.357                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="w8o-Py-AVt" id="0wZ-Iy-bZj">
   3.358 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="71"/>
   3.359 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="72"/>
   3.360                                      <autoresizingMask key="autoresizingMask"/>
   3.361                                      <subviews>
   3.362                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Swb-L2-8yp">
   3.363 @@ -1819,7 +1819,7 @@
   3.364                                  <rect key="frame" x="0.0" y="266" width="375" height="200"/>
   3.365                                  <autoresizingMask key="autoresizingMask"/>
   3.366                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="emX-Ao-r5Q" id="Tft-DN-iZy">
   3.367 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="199"/>
   3.368 +                                    <rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
   3.369                                      <autoresizingMask key="autoresizingMask"/>
   3.370                                      <subviews>
   3.371                                          <webView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Aso-tc-Ukd">
   3.372 @@ -1888,8 +1888,8 @@
   3.373          <image name="unread-icon" width="22" height="22"/>
   3.374      </resources>
   3.375      <inferredMetricsTieBreakers>
   3.376 +        <segue reference="Na7-CM-lbe"/>
   3.377          <segue reference="dEP-ah-AVP"/>
   3.378 -        <segue reference="3ib-x8-sKW"/>
   3.379 -        <segue reference="Usl-iS-7fo"/>
   3.380 +        <segue reference="6vv-Jr-8Nm"/>
   3.381      </inferredMetricsTieBreakers>
   3.382  </document>
     4.1 --- a/pEpForiOS/UI/AccountsAndFolders/AccountsTableViewController.swift	Thu Jan 12 13:21:38 2017 +0100
     4.2 +++ b/pEpForiOS/UI/AccountsAndFolders/AccountsTableViewController.swift	Thu Jan 12 15:14:02 2017 +0100
     4.3 @@ -38,6 +38,8 @@
     4.4      
     4.5      override func viewDidLoad() {
     4.6          super.viewDidLoad()
     4.7 +        
     4.8 +       title = "Accounts.title".localized
     4.9      }
    4.10  
    4.11      override func viewWillAppear(_ animated: Bool) {
    4.12 @@ -74,11 +76,7 @@
    4.13      override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
    4.14              return accounts.count
    4.15      }
    4.16 -
    4.17 -    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
    4.18 -        return "Accounts.HeaderTitle".localized
    4.19 -    }
    4.20 -
    4.21 +    
    4.22      override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
    4.23  
    4.24          let cell = tableView.dequeueReusableCell(withIdentifier: accountsCellIdentifier, for: indexPath)
     5.1 --- a/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Jan 12 13:21:38 2017 +0100
     5.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Jan 12 15:14:02 2017 +0100
     5.3 @@ -31,6 +31,7 @@
     5.4      override func viewDidLoad() {
     5.5          super.viewDidLoad()
     5.6          
     5.7 +        title = "EmailList.title".localized
     5.8          UIHelper.emailListTableHeight(self.tableView)
     5.9          addSearchBar()
    5.10      }
     6.1 --- a/pEpForiOS/UI/ImapSetup/IMAPSettingsTableView.swift	Thu Jan 12 13:21:38 2017 +0100
     6.2 +++ b/pEpForiOS/UI/ImapSetup/IMAPSettingsTableView.swift	Thu Jan 12 15:14:02 2017 +0100
     6.3 @@ -36,6 +36,7 @@
     6.4      open override func viewDidLoad() {
     6.5          super.viewDidLoad()
     6.6          
     6.7 +        title = "ImapSettings.title".localized
     6.8          UIHelper.variableCellHeightsTableView(tableView)
     6.9          fields = [serverValue, portValue]
    6.10      }
     7.1 --- a/pEpForiOS/UI/ImapSetup/SMTPSettingsTableView.swift	Thu Jan 12 13:21:38 2017 +0100
     7.2 +++ b/pEpForiOS/UI/ImapSetup/SMTPSettingsTableView.swift	Thu Jan 12 15:14:02 2017 +0100
     7.3 @@ -37,6 +37,7 @@
     7.4      open override func viewDidLoad() {
     7.5          super.viewDidLoad()
     7.6          
     7.7 +        title = "SmtpSettings.title".localized
     7.8          UIHelper.variableCellHeightsTableView(tableView)
     7.9          fields = [serverValue, portValue]
    7.10      }
     8.1 --- a/pEpForiOS/UI/ImapSetup/UserInfoTableView.swift	Thu Jan 12 13:21:38 2017 +0100
     8.2 +++ b/pEpForiOS/UI/ImapSetup/UserInfoTableView.swift	Thu Jan 12 15:14:02 2017 +0100
     8.3 @@ -103,6 +103,7 @@
     8.4      open override func viewDidLoad() {
     8.5          super.viewDidLoad()
     8.6          
     8.7 +        title = "NewAccount.title".localized
     8.8          handleCancelButtonVisibility()
     8.9          passwordValue.delegate = self
    8.10          UIHelper.variableCellHeightsTableView(tableView)
     9.1 --- a/pEpForiOS/en.lproj/Localizable.strings	Thu Jan 12 13:21:38 2017 +0100
     9.2 +++ b/pEpForiOS/en.lproj/Localizable.strings	Thu Jan 12 15:14:02 2017 +0100
     9.3 @@ -35,13 +35,16 @@
     9.4  "Message.Subject" = "Subject: ";
     9.5  "Message.To" = "To: ";
     9.6  
     9.7 -
     9.8 -// Account List
     9.9 -
    9.10 -"Accounts.HeaderTitle" = "Accounts";
    9.11 -
    9.12  // Account Settings
    9.13  
    9.14  "AccountsSettings.Account" = "Account";
    9.15  "AccountsSettings.IMAP" = "IMAP Settings";
    9.16  "AccountsSettings.SMTP" = "SMTP Settings";
    9.17 +
    9.18 +// title strings
    9.19 +
    9.20 +"EmailList.title" = "Inbox";
    9.21 +"Accounts.title" = "Accounts";
    9.22 +"NewAccount.title" = "New Account";
    9.23 +"ImapSettings.title" = "IMAP Settings";
    9.24 +"SmtpSettings.title" = "SMTP Settings";