Merge default IOS-2064
authorMartin Brude
Thu, 12 Mar 2020 09:49:46 +0100
branchIOS-2064
changeset 122154e2fb067ea26
parent 11831 d9233ba66304
parent 12211 402fdfa0698c
child 12216 575318131f4d
Merge default
     1.1 --- a/.hgtags	Tue Feb 18 18:23:43 2020 +0100
     1.2 +++ b/.hgtags	Thu Mar 12 09:49:46 2020 +0100
     1.3 @@ -73,3 +73,8 @@
     1.4  8e4e9e05ac94b6ceb8e48d8e43ca861567a36ec7 v1.0.908
     1.5  d1d314d801cb41fde410eb782cbd37e5b0df72f5 v1.0.909
     1.6  3ae8646f5d794c8bf3a264f5278c339f90ab744b v1.0.910
     1.7 +afdb3a682bc2c7ebacfc8be61a9704010db0dd47 v1.0.911
     1.8 +62e3cd3cd02b1e51b1e849ce8036610700a7f6f7 v1.0.912
     1.9 +bce1ffebd3cfdf57bb1ad251c9d0725f1b3624c1 v1.0.913
    1.10 +ca608aba2c85d7e40b537a846d4202d3448208ac v1.0.914
    1.11 +7c00dea1fb311fd181d0b9d7ed5d20b521e70e19 v1.0.915
     2.1 --- a/CHANGESETS	Tue Feb 18 18:23:43 2020 +0100
     2.2 +++ b/CHANGESETS	Thu Mar 12 09:49:46 2020 +0100
     2.3 @@ -1,15 +1,15 @@
     2.4  v$(MARKETING_VERSION)
     2.5  AppAuth-iOS: c9103384853af90b046219573f322286de306564
     2.6 -MessageModel: 15a4466ed509
     2.7 +MessageModel: 679666898497
     2.8  OpenSSL-for-iPhone: 10019638e80e8a8a5fc19642a840d8a69fac7349
     2.9  SwipeCellKit: 00cd0cb5f9ceb4ae7a245fe21bf45643285d454b
    2.10  ldns: e83e808f0c56f6235061f5c904ff476ca75aa576
    2.11 -libAccountSettings: 23e0aedaf6a7
    2.12 +libAccountSettings: 6f80e12e0379
    2.13  libetpan: c76daba0153eed0003d6990a5adadba8d561b8fa
    2.14 -pEp-Translate: 3c45a41fdb1634881442d8534782b1416266f64c
    2.15 -pEpEngine: a9d0247b79ff
    2.16 -pEpObjCAdapter: 33119ff061e5
    2.17 -pEp_for_iOS: 56566b3f3c36+
    2.18 +pEp-Translate: d803ce0ac11a7d568ab296e527832e438cb4edd7
    2.19 +pEpEngine: 582a1e585f10
    2.20 +pEpObjCAdapter: 76b4766ebb92
    2.21 +pEp_for_iOS: 29e6a0e5bb3a+
    2.22  pEp_for_iOS_intern: fe7c80780efc+
    2.23 -pantomime-iOS: 55938caf87ac
    2.24 +pantomime-iOS: 9de6754a61fb
    2.25  sequoia4ios: 3b4b432400c9827ecaf2f7a185333ea1488f4e5c
     3.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-1a.pdf has changed
     4.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-1b.pdf has changed
     5.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-2a.pdf has changed
     6.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-2b.pdf has changed
     7.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-2c.pdf has changed
     8.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-3.pdf has changed
     9.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-4.pdf has changed
    10.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-4a.pdf has changed
    11.1 Binary file Design/icons/pEpForIOS-Asset-Tutorial-4b.pdf has changed
    12.1 Binary file Design/icons/pEpForiOS-icon-compose.pdf has changed
    13.1 Binary file Design/icons/pEpForiOS-icon-mistrusted.pdf has changed
    14.1 Binary file Design/icons/pEpForiOS-icon-secure&trusted.pdf has changed
    15.1 Binary file Design/icons/pEpForiOS-icon-secure.pdf has changed
    16.1 Binary file Design/icons/pep-status-mistrusted-catalan.pdf has changed
    17.1 Binary file Design/icons/pep-status-mistrusted-dutch.pdf has changed
    18.1 Binary file Design/icons/pep-status-mistrusted-english.pdf has changed
    19.1 Binary file Design/icons/pep-status-mistrusted-french.pdf has changed
    20.1 Binary file Design/icons/pep-status-mistrusted-spanish.pdf has changed
    21.1 Binary file Design/icons/pep-status-mistrusted-turkish.pdf has changed
    22.1 Binary file Design/icons/pep-status-secure&trusted-catalan.pdf has changed
    23.1 Binary file Design/icons/pep-status-secure&trusted-disabled-catalan.pdf has changed
    24.1 Binary file Design/icons/pep-status-secure&trusted-disabled-dutch.pdf has changed
    25.1 Binary file Design/icons/pep-status-secure&trusted-disabled-french.pdf has changed
    26.1 Binary file Design/icons/pep-status-secure&trusted-disabled-spanish.pdf has changed
    27.1 Binary file Design/icons/pep-status-secure&trusted-disabled-turkish.pdf has changed
    28.1 Binary file Design/icons/pep-status-secure&trusted-dutch.pdf has changed
    29.1 Binary file Design/icons/pep-status-secure&trusted-french.pdf has changed
    30.1 Binary file Design/icons/pep-status-secure&trusted-spanish.pdf has changed
    31.1 Binary file Design/icons/pep-status-secure&trusted-turkish.pdf has changed
    32.1 Binary file Design/icons/pep-status-secure-catalan.pdf has changed
    33.1 Binary file Design/icons/pep-status-secure-disabled-catalan.pdf has changed
    34.1 Binary file Design/icons/pep-status-secure-disabled-dutch.pdf has changed
    35.1 Binary file Design/icons/pep-status-secure-disabled-french.pdf has changed
    36.1 Binary file Design/icons/pep-status-secure-disabled-spanish.pdf has changed
    37.1 Binary file Design/icons/pep-status-secure-disabled-turkish.pdf has changed
    38.1 Binary file Design/icons/pep-status-secure-dutch.pdf has changed
    39.1 Binary file Design/icons/pep-status-secure-french.pdf has changed
    40.1 Binary file Design/icons/pep-status-secure-spanish.pdf has changed
    41.1 Binary file Design/icons/pep-status-secure-turkish.pdf has changed
    42.1 Binary file Design/icons/pep-status-underattack-catalan.pdf has changed
    43.1 Binary file Design/icons/pep-status-underattack-dutch.pdf has changed
    44.1 Binary file Design/icons/pep-status-underattack-french.pdf has changed
    45.1 Binary file Design/icons/pep-status-underattack-spanish.pdf has changed
    46.1 Binary file Design/icons/pep-status-underattack-turkish.pdf has changed
    47.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    47.2 +++ b/Submodules/pEpIOSToolbox/pEpIOSToolbox/Foundation/RangeExpression+Extension.swift	Thu Mar 12 09:49:46 2020 +0100
    47.3 @@ -0,0 +1,18 @@
    47.4 +//
    47.5 +//  NSRanges+Extension.swift
    47.6 +//  pEpIOSToolbox
    47.7 +//
    47.8 +//  Created by Martin Brude on 02/03/2020.
    47.9 +//  Copyright © 2020 pEp Security SA. All rights reserved.
   47.10 +//
   47.11 +
   47.12 +import Foundation
   47.13 +
   47.14 +extension RangeExpression where Bound == String.Index  {
   47.15 +    
   47.16 +    /// Convert a Range expresion into a NSRange
   47.17 +    /// - Parameter string: The text to get the range.
   47.18 +    func nsRange<S: StringProtocol>(in string: S) -> NSRange {
   47.19 +        .init(self, in: string)
   47.20 +    }
   47.21 +}
    48.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    48.2 +++ b/Submodules/pEpIOSToolbox/pEpIOSToolbox/Foundation/StringProtocol+NSRanges.swift	Thu Mar 12 09:49:46 2020 +0100
    48.3 @@ -0,0 +1,55 @@
    48.4 +//
    48.5 +//  StringProtocol+NSRanges.swift
    48.6 +//  pEpIOSToolbox
    48.7 +//
    48.8 +//  Created by Martin Brude on 02/03/2020.
    48.9 +//  Copyright © 2020 pEp Security SA. All rights reserved.
   48.10 +//
   48.11 +
   48.12 +import Foundation
   48.13 +
   48.14 +extension StringProtocol {
   48.15 +
   48.16 +    /// Obtains the NSRange of certaint text.
   48.17 +    /// Usage example:
   48.18 +    /// "This is a wonderful method".nsRange(of: "wonderful") returns a NSRange with location 10, lenght 9.
   48.19 +    ///
   48.20 +    /// - Parameters:
   48.21 +    ///   - string: The base text that might contantains the substring
   48.22 +    ///   - options: Represents the options to search and compare.
   48.23 +    ///   - range: The range where to look for the subtext. If nil, will search in the complete text.
   48.24 +    ///   - locale: If not specified will use the current locale.
   48.25 +    /// - Returns: The range of the text passed by parameter. If it's not found returns nil.
   48.26 +    public func nsRange<S: StringProtocol>(of string: S, options: String.CompareOptions = [], range: Range<Index>? = nil, locale: Locale? = nil) -> NSRange? {
   48.27 +        self.range(of: string,
   48.28 +                   options: options,
   48.29 +                   range: range ?? startIndex..<endIndex,
   48.30 +                   locale: locale ?? .current)?
   48.31 +            .nsRange(in: self)
   48.32 +    }
   48.33 +
   48.34 +    /// Obtains the NSRanges of certaint text.
   48.35 +    /// Usage example:
   48.36 +    /// "This is a very very clear".nsRange(of: "very") returns two NSRanges, one on location 10, the other on location 15.
   48.37 +    /// - Parameters:
   48.38 +    ///   - string: The base text that might contantains the substrings
   48.39 +    ///   - options: Represents the options to search and compare.
   48.40 +    ///   - range: The range where to look for the subtexts. If nil, will search in the complete base text.
   48.41 +    ///   - locale: If not specified will use the current locale.
   48.42 +    /// - Returns: The ranges of the text passed by parameter. If it's not found returns nil.
   48.43 +    public func nsRanges<S: StringProtocol>(of string: S, options: String.CompareOptions = [], range: Range<Index>? = nil, locale: Locale? = nil) -> [NSRange] {
   48.44 +        var start = range?.lowerBound ?? startIndex
   48.45 +        let end = range?.upperBound ?? endIndex
   48.46 +        var ranges: [NSRange] = []
   48.47 +        while start < end,
   48.48 +            let range = self.range(of: string,
   48.49 +                                   options: options,
   48.50 +                                   range: start..<end,
   48.51 +                                   locale: locale ?? .current) {
   48.52 +            ranges.append(range.nsRange(in: self))
   48.53 +            start = range.lowerBound < range.upperBound ? range.upperBound :
   48.54 +            index(range.lowerBound, offsetBy: 1, limitedBy: endIndex) ?? endIndex
   48.55 +        }
   48.56 +        return ranges
   48.57 +    }
   48.58 +}
    49.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    49.2 +++ b/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UIApplication+NavigationStack.swift	Thu Mar 12 09:49:46 2020 +0100
    49.3 @@ -0,0 +1,37 @@
    49.4 +//
    49.5 +//  UIApplication+NavigationStack.swift
    49.6 +//  pEpIOSToolbox
    49.7 +//
    49.8 +//  Created by Andreas Buff on 21.02.20.
    49.9 +//  Copyright © 2020 pEp Security SA. All rights reserved.
   49.10 +//
   49.11 +
   49.12 +import UIKit
   49.13 +
   49.14 +// MARK: - UIApplication+NavigationStack
   49.15 +
   49.16 +extension UIApplication {
   49.17 +
   49.18 +    /// - returns: The view controller at the top of the navigation stack.
   49.19 +    class public func topViewController(
   49.20 +        inNavigationStackOf viewController: UIViewController? = UIApplication.shared.keyWindow?.rootViewController) -> UIViewController? {
   49.21 +        guard let vc = viewController else {
   49.22 +            Log.shared.errorAndCrash("No VC. Probably unexpected.")
   49.23 +            return nil
   49.24 +        }
   49.25 +        if let nav = vc as? UINavigationController {
   49.26 +            return topViewController(inNavigationStackOf: nav.topViewController)
   49.27 +        } else if let tab = vc as? UITabBarController, let selected = tab.selectedViewController {
   49.28 +            return topViewController(inNavigationStackOf: selected)
   49.29 +        } else if let splitVC = viewController as? UISplitViewController {
   49.30 +            guard let vc = splitVC.viewControllers.first else {
   49.31 +                Log.shared.errorAndCrash("Splitview without Primary VC?")
   49.32 +                return nil
   49.33 +            }
   49.34 +            return topViewController(inNavigationStackOf: vc)
   49.35 +        } else if let presented = vc.presentedViewController {
   49.36 +            return topViewController(inNavigationStackOf: presented)
   49.37 +        }
   49.38 +        return vc
   49.39 +    }
   49.40 +}
    50.1 --- a/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UIFont+Extension.swift	Tue Feb 18 18:23:43 2020 +0100
    50.2 +++ b/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UIFont+Extension.swift	Thu Mar 12 09:49:46 2020 +0100
    50.3 @@ -6,7 +6,6 @@
    50.4  //  Copyright © 2020 pEp Security SA. All rights reserved.
    50.5  //
    50.6  
    50.7 -import Foundation
    50.8  import UIKit
    50.9  
   50.10  /// UIFont extension that provides fonts based on weight and style.
   50.11 @@ -16,51 +15,79 @@
   50.12  /// Usage example: let font = UIFont.pepFont(style: .body, weight: .regular)
   50.13  extension UIFont {
   50.14  
   50.15 -    private static let medium = "SFUIText-Medium"
   50.16 -    private static let regular = "SFUIText-Regular"
   50.17 -    private static let semibold = "SFUIText-Semibold"
   50.18 +    static private let medium = "SFUIText-Medium"
   50.19 +    static private let regular = "SFUIText-Regular"
   50.20 +    static private let semibold = "SFUIText-Semibold"
   50.21  
   50.22 +    
   50.23 +    
   50.24 +    
   50.25      /// Retrieves the font for the provided style and type
   50.26      /// - Parameters:
   50.27      ///   - style: The style of the font.
   50.28      ///   - weight: The weight of the font.
   50.29      public static func pepFont(style: TextStyle,
   50.30                                 weight: UIFont.Weight) -> UIFont {
   50.31 -        let name: String
   50.32 -        switch weight {
   50.33 -        case .medium:
   50.34 -            name = medium
   50.35 -        case .regular:
   50.36 -            name = regular
   50.37 -        case .semibold:
   50.38 -            name = semibold
   50.39 -        default:
   50.40 -            name = regular
   50.41 -        }
   50.42 -        
   50.43 -        guard let font = UIFont(name: name,
   50.44 +        guard let font = UIFont(name: getFontName(from: weight),
   50.45                                  size: preferredFontSize(for: style)) else {
   50.46                                      Log.shared.info("Missing custom font. System default font for specified style is used now.")
   50.47 -                                    return UIFont.systemFont(ofSize: preferredFontSize(for: style), weight: weight)
   50.48 +                                    return UIFont.systemFont(ofSize: preferredFontSize(for: style),
   50.49 +                                                             weight: weight)
   50.50          }
   50.51 +        // We don't want to lose textStyle attribute in our custom fonts!
   50.52 +        font.fontDescriptor.addingAttributes([.textStyle : style])
   50.53 +        font.fontDescriptor.addingAttributes([.family : getFontName(from: weight)])
   50.54          return font
   50.55      }
   50.56  
   50.57      /// Return font - custom typeface from given system default font (Dynamic Font Sizes - Accessibility)
   50.58      /// - Parameter systemDynamicFont: system font with specified Text Style
   50.59 -    public static func pEpPreferredFontTypeFace(systemDynamicFont: UIFont) -> UIFont {
   50.60 -        guard let textStyle = systemDynamicFont.fontDescriptor.object(forKey: UIFontDescriptor.AttributeName.textStyle) as? String else {
   50.61 -            Log.shared.error("Missing UIFont.TextStyle")
   50.62 -            return systemDynamicFont
   50.63 +    public static func pEpPreferredFontTypeFace(systemDynamicFont: UIFont, weight: UIFont.Weight?) -> UIFont {
   50.64 +        let defaultWeight = weight ?? getFontWeight(from: systemDynamicFont)
   50.65 +        guard let textStyle = systemDynamicFont.fontDescriptor.object(forKey: .textStyle) as? String else {
   50.66                  Log.shared.error("Missing UIFont.TextStyle")
   50.67                  return systemDynamicFont
   50.68          }
   50.69 -
   50.70 -        return UIFont.pepFont(style: UIFont.TextStyle.init(rawValue: textStyle),
   50.71 -                              weight: .regular)
   50.72 +        let customFont = UIFont.pepFont(style: UIFont.TextStyle.init(rawValue:textStyle),
   50.73 +                                        weight: weight ?? defaultWeight)
   50.74 +        // We don't want to lose textStyle attribute in our custom fonts!
   50.75 +        customFont.fontDescriptor.addingAttributes([.textStyle : textStyle])
   50.76 +        customFont.fontDescriptor.addingAttributes([.family : getFontName(from: weight ?? defaultWeight)])
   50.77 +        return customFont
   50.78 +    }
   50.79 +    
   50.80 +    static private func preferredFontSize(for textStyle: TextStyle) -> CGFloat {
   50.81 +        let customFont = UIFont.preferredFont(forTextStyle: textStyle)
   50.82 +        let pointSize = customFont.pointSize
   50.83 +        // We don't want to lose textStyle attribute in our custom fonts!
   50.84 +        customFont.fontDescriptor.addingAttributes([.textStyle : textStyle])
   50.85 +        return pointSize
   50.86      }
   50.87  
   50.88 -    private static func preferredFontSize(for textStyle: TextStyle) -> CGFloat {
   50.89 -        return UIFont.preferredFont(forTextStyle: textStyle).pointSize
   50.90 +    static private func getFontWeight(from font: UIFont) -> UIFont.Weight {
   50.91 +        let familyName = font.fontDescriptor
   50.92 +        print("DEV: familyName: \(familyName)")
   50.93 +        if let fontName: String = font.fontDescriptor.fontAttributes[.visibleName] as? String {
   50.94 +            print("DEV: fontName: \(fontName)")
   50.95 +            if fontName.lowercased().contains(medium.lowercased()) {
   50.96 +                return UIFont.Weight.medium
   50.97 +            } else if fontName.lowercased().contains(semibold.lowercased()) {
   50.98 +                return .semibold
   50.99 +            }
  50.100 +        }
  50.101 +        return .regular
  50.102 +    }
  50.103 +
  50.104 +    static private func getFontName(from weight: UIFont.Weight) -> String {
  50.105 +        switch weight {
  50.106 +        case .medium:
  50.107 +            return medium
  50.108 +        case .regular:
  50.109 +            return regular
  50.110 +        case .semibold:
  50.111 +            return semibold
  50.112 +        default:
  50.113 +            return regular
  50.114 +        }
  50.115      }
  50.116  }
    51.1 --- a/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UILabel+Font.swift	Tue Feb 18 18:23:43 2020 +0100
    51.2 +++ b/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UILabel+Font.swift	Thu Mar 12 09:49:46 2020 +0100
    51.3 @@ -10,7 +10,7 @@
    51.4  
    51.5  extension UILabel {
    51.6      /// Sets pEp default custom font with respecting TextStyle - Dynamic Fonts
    51.7 -    public func pEpSetFontFace() {
    51.8 -        font = UIFont.pEpPreferredFontTypeFace(systemDynamicFont: font)
    51.9 +    public func pEpSetFontFace(weight: UIFont.Weight? = nil) {
   51.10 +        font = .pEpPreferredFontTypeFace(systemDynamicFont: font, weight: weight)
   51.11      }
   51.12  }
    52.1 --- a/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UITextView+Font.swift	Tue Feb 18 18:23:43 2020 +0100
    52.2 +++ b/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UITextView+Font.swift	Thu Mar 12 09:49:46 2020 +0100
    52.3 @@ -10,7 +10,7 @@
    52.4  
    52.5  extension UITextView {
    52.6      /// Sets pEp default custom font with respecting TextStyle - Dynamic Fonts
    52.7 -    public func pEpSetFontFace() {
    52.8 +    public func pEpSetFontFace(weight: UIFont.Weight = .regular) {
    52.9          guard let fontFace = font,
   52.10              let textStyle = fontFace.fontDescriptor.object(forKey: UIFontDescriptor.AttributeName.textStyle) as? String else {
   52.11                  Log.shared.error("Missing UIFont.TextStyle")
   52.12 @@ -18,6 +18,6 @@
   52.13          }
   52.14  
   52.15          font = UIFont.pepFont(style: UIFont.TextStyle.init(rawValue: textStyle),
   52.16 -                              weight: .regular)
   52.17 +                              weight: weight)
   52.18      }
   52.19  }
    53.1 --- a/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UiSplitViewController+DisplayMode.swift	Tue Feb 18 18:23:43 2020 +0100
    53.2 +++ b/Submodules/pEpIOSToolbox/pEpIOSToolbox/UIKit/UiSplitViewController+DisplayMode.swift	Thu Mar 12 09:49:46 2020 +0100
    53.3 @@ -9,25 +9,6 @@
    53.4  import Foundation
    53.5  import UIKit
    53.6  
    53.7 -public extension UIViewController {
    53.8 -
    53.9 -    /// Method to detect the actual status of the splitViewController
   53.10 -    ///
   53.11 -    /// - Returns: returns the value of the actual status of the split view controller using SplitViewDisplayMode
   53.12 -    func currentSplitViewMode() -> UISplitViewController.SplitViewDisplayMode {
   53.13 -        guard let splitview = splitViewController else {
   53.14 -            return .onlyMaster
   53.15 -        }
   53.16 -        return splitview.currentDisplayMode
   53.17 -    }
   53.18 -
   53.19 -    var onlySplitViewMasterIsShown: Bool {
   53.20 -        get {
   53.21 -            return currentSplitViewMode() == .onlyMaster
   53.22 -        }
   53.23 -    }
   53.24 -}
   53.25 -
   53.26  public extension UISplitViewController {
   53.27  
   53.28      /// Specify the current state of the splitviewcontroller
    54.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Tue Feb 18 18:23:43 2020 +0100
    54.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Thu Mar 12 09:49:46 2020 +0100
    54.3 @@ -25,7 +25,7 @@
    54.4  		00A12CAE20D3D9AC00B82BE3 /* FullMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A12CAD20D3D9AC00B82BE3 /* FullMessageCell.swift */; };
    54.5  		00AEB2F620DBA7DA00DA185A /* NeedsRefreshDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00AEB2F520DBA7DA00DA185A /* NeedsRefreshDelegate.swift */; };
    54.6  		00BEC89720B85FD300A36E60 /* NothingSelectedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00BEC89620B85FD300A36E60 /* NothingSelectedViewController.swift */; };
    54.7 -		00D3CD3E20B58976009ABBC9 /* PrimarySplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D3CD3D20B58976009ABBC9 /* PrimarySplitViewController.swift */; };
    54.8 +		00D3CD3E20B58976009ABBC9 /* PEPSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D3CD3D20B58976009ABBC9 /* PEPSplitViewController.swift */; };
    54.9  		00DF2C3B2164C53F004EBA6C /* FolderViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00DF2C3A2164C53F004EBA6C /* FolderViewModelTest.swift */; };
   54.10  		00EB89AB20E3A27C00CDFA0D /* ThreadViewcontroller+SizeClasses.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00EB89AA20E3A27C00CDFA0D /* ThreadViewcontroller+SizeClasses.swift */; };
   54.11  		00EB89AD20E3D3C200CDFA0D /* ThreadedEmailViewModel+MoveToFolderDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00EB89AC20E3D3C200CDFA0D /* ThreadedEmailViewModel+MoveToFolderDelegate.swift */; };
   54.12 @@ -36,14 +36,26 @@
   54.13  		150B8EB31FCEB93D00374438 /* UIUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 150B8EB21FCEB93D00374438 /* UIUtils.swift */; };
   54.14  		150DF6D02052A13700A9DCF7 /* SecureWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 150DF6CF2052A13700A9DCF7 /* SecureWebViewController.swift */; };
   54.15  		150E18C0219D8C6C009E9048 /* ComposeViewModelSectionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 150E18BF219D8C6C009E9048 /* ComposeViewModelSectionTest.swift */; };
   54.16 +		1512132424166A6E009B7C88 /* AccountSettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1512132324166A6E009B7C88 /* AccountSettingsTableViewController.swift */; };
   54.17 +		1512132724166AD9009B7C88 /* small-animated-gif.gif in Resources */ = {isa = PBXBuildFile; fileRef = 1512132524166AD8009B7C88 /* small-animated-gif.gif */; };
   54.18 +		1512132824166AD9009B7C88 /* large-animated-gif.gif in Resources */ = {isa = PBXBuildFile; fileRef = 1512132624166AD8009B7C88 /* large-animated-gif.gif */; };
   54.19 +		1512133124166C7B009B7C88 /* PantomimeFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159E1F1222BD074F007D711F /* PantomimeFramework.framework */; };
   54.20 +		1512133224166C7B009B7C88 /* PantomimeFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 159E1F1222BD074F007D711F /* PantomimeFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.21 +		1512133324166C83009B7C88 /* PEPObjCAdapterFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159E1F1422BD0756007D711F /* PEPObjCAdapterFramework.framework */; };
   54.22 +		1512133424166C83009B7C88 /* PEPObjCAdapterFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 159E1F1422BD0756007D711F /* PEPObjCAdapterFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.23 +		1512133524166C95009B7C88 /* libAccountSettingsAdapter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D213332237C8CA00C060A1 /* libAccountSettingsAdapter.a */; };
   54.24 +		1512133D24166CE0009B7C88 /* ldns_xcode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1512133C24166CDF009B7C88 /* ldns_xcode.framework */; };
   54.25 +		1512133E24166CE0009B7C88 /* ldns_xcode.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1512133C24166CDF009B7C88 /* ldns_xcode.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.26  		15146C8A237EE77A00D69495 /* SettingsInternalError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15146C89237EE77A00D69495 /* SettingsInternalError.swift */; };
   54.27  		15146C8C237F006F00D69495 /* KeySyncWizardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15146C8B237F006F00D69495 /* KeySyncWizardViewController.swift */; };
   54.28  		15146C91237F07EF00D69495 /* PEPPageViewControllerBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15146C90237F07EF00D69495 /* PEPPageViewControllerBase.swift */; };
   54.29  		15147EF7237EBE2A003989FE /* AppSettings+KeySyncDeviceGroupStateChangeNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15147EF6237EBE2A003989FE /* AppSettings+KeySyncDeviceGroupStateChangeNotification.swift */; };
   54.30  		15175CEC205929FB00A8D9D0 /* CidHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15175CEB205929FB00A8D9D0 /* CidHandler.swift */; };
   54.31  		151AD7AD219D74C700FC36FF /* ComposeViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151AD7AC219D74C700FC36FF /* ComposeViewModelTest.swift */; };
   54.32 +		151C67FF2418158B00481F75 /* SFUIText-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 151C67FC2418158B00481F75 /* SFUIText-Semibold.ttf */; };
   54.33 +		151C68002418158B00481F75 /* SFUIText-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 151C67FD2418158B00481F75 /* SFUIText-Regular.ttf */; };
   54.34 +		151C68012418158B00481F75 /* SFUIText-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 151C67FE2418158B00481F75 /* SFUIText-Medium.ttf */; };
   54.35  		151DE7DE1FC5D3E200CDC273 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 151DE7E01FC5D3E200CDC273 /* Settings.storyboard */; };
   54.36 -		151DE7E11FC5D3FA00CDC273 /* Handshake.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 151DE7E31FC5D3FA00CDC273 /* Handshake.storyboard */; };
   54.37  		151DE7E41FC5D41600CDC273 /* FolderViews.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 151DE7E61FC5D41600CDC273 /* FolderViews.storyboard */; };
   54.38  		151F71F7202A06760057C74D /* TestDataBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71EC202A06750057C74D /* TestDataBase.swift */; };
   54.39  		151F71FB202A06760057C74D /* MockBackgrounder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71F0202A06750057C74D /* MockBackgrounder.swift */; };
   54.40 @@ -108,20 +120,6 @@
   54.41  		1543B6A822ABDAAE002B59AB /* Identity+pEp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1543B6A722ABDAAE002B59AB /* Identity+pEp.swift */; };
   54.42  		1543B6B022ABF53C002B59AB /* KeySyncDeviceGroupUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1543B6AF22ABF53C002B59AB /* KeySyncDeviceGroupUtil.swift */; };
   54.43  		154660D42334E2FC008D2137 /* Message+SecurityBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 154660D32334E2FC008D2137 /* Message+SecurityBadge.swift */; };
   54.44 -		154918D022BA74230091B6D6 /* ldns_xcode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 154918CF22BA74230091B6D6 /* ldns_xcode.framework */; };
   54.45 -		154918D122BA74230091B6D6 /* ldns_xcode.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 154918CF22BA74230091B6D6 /* ldns_xcode.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.46 -		154918D422BA74670091B6D6 /* pEpIOSToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 154918D322BA74670091B6D6 /* pEpIOSToolbox.framework */; };
   54.47 -		154918D522BA74670091B6D6 /* pEpIOSToolbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 154918D322BA74670091B6D6 /* pEpIOSToolbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.48 -		154918D722BA74700091B6D6 /* SwipeCellKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 154918D622BA74700091B6D6 /* SwipeCellKit.framework */; };
   54.49 -		154918D822BA74700091B6D6 /* SwipeCellKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 154918D622BA74700091B6D6 /* SwipeCellKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.50 -		154918DA22BA74800091B6D6 /* MessageModel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 154918D922BA74800091B6D6 /* MessageModel.framework */; };
   54.51 -		154918DB22BA74800091B6D6 /* MessageModel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 154918D922BA74800091B6D6 /* MessageModel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.52 -		154918DD22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 154918DC22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework */; };
   54.53 -		154918DE22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 154918DC22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.54 -		154918E022BA74BA0091B6D6 /* AppAuth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 154918DF22BA74BA0091B6D6 /* AppAuth.framework */; };
   54.55 -		154918E122BA74BA0091B6D6 /* AppAuth.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 154918DF22BA74BA0091B6D6 /* AppAuth.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.56 -		154918E322BA74D70091B6D6 /* PantomimeFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 154918E222BA74D70091B6D6 /* PantomimeFramework.framework */; };
   54.57 -		154918E422BA74D70091B6D6 /* PantomimeFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 154918E222BA74D70091B6D6 /* PantomimeFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
   54.58  		154D173D2373327C001FDF78 /* CoreDataDrivenTestBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 154D173C2373327C001FDF78 /* CoreDataDrivenTestBase.swift */; };
   54.59  		155050F01FE82356009CEAD2 /* UserNotificationTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 155050EF1FE82356009CEAD2 /* UserNotificationTool.swift */; };
   54.60  		155050F21FE95D8A009CEAD2 /* UserNotificationTool+pEp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 155050F11FE95D8A009CEAD2 /* UserNotificationTool+pEp.swift */; };
   54.61 @@ -131,6 +129,7 @@
   54.62  		155F2D9E20530798001B4B1C /* Reusable.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 155F2DA020530798001B4B1C /* Reusable.storyboard */; };
   54.63  		15679F0D2292F4090051DCC3 /* FilterViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15679F0C2292F4090051DCC3 /* FilterViewDelegate.swift */; };
   54.64  		1568FEA11FACDCC600993EA3 /* IOS-211_hi_there.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1568FEA01FACDCC500993EA3 /* IOS-211_hi_there.txt */; };
   54.65 +		156D494023FE953C00EA18A9 /* ClientCertificateUIUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 156D493F23FE953C00EA18A9 /* ClientCertificateUIUtil.swift */; };
   54.66  		1574D078211356E000FEDC93 /* UrlClickHandlerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1574D077211356E000FEDC93 /* UrlClickHandlerProtocol.swift */; };
   54.67  		1574D07A211464CC00FEDC93 /* URL+MailTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1574D079211464CC00FEDC93 /* URL+MailTo.swift */; };
   54.68  		1574D07D2114696B00FEDC93 /* URL+MailToTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1574D07C2114696B00FEDC93 /* URL+MailToTest.swift */; };
   54.69 @@ -140,12 +139,12 @@
   54.70  		15874BC12127493E00A3A4A6 /* SettingSwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BA82127493E00A3A4A6 /* SettingSwitchTableViewCell.swift */; };
   54.71  		15874BC72127493E00A3A4A6 /* SettingDefaultAccountTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BB02127493E00A3A4A6 /* SettingDefaultAccountTableViewController.swift */; };
   54.72  		15874BCB2127493E00A3A4A6 /* AccountVerificationResultDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BB82127493E00A3A4A6 /* AccountVerificationResultDelegate.swift */; };
   54.73 -		15874BCC2127493E00A3A4A6 /* AccountSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BB92127493E00A3A4A6 /* AccountSettingsViewModel.swift */; };
   54.74  		15874BCD2127493E00A3A4A6 /* AccountSettingsError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BBA2127493E00A3A4A6 /* AccountSettingsError.swift */; };
   54.75 -		15874BCF2127493E00A3A4A6 /* AccountSettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BBC2127493E00A3A4A6 /* AccountSettingsTableViewController.swift */; };
   54.76  		15874BD12127493E00A3A4A6 /* TrustedServerSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BBF2127493E00A3A4A6 /* TrustedServerSettingsViewModel.swift */; };
   54.77  		15874BD22127493E00A3A4A6 /* TrustedServerSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BC02127493E00A3A4A6 /* TrustedServerSettingsViewController.swift */; };
   54.78  		15874BD421274BD400A3A4A6 /* TrustedServerSettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15874BD321274BD400A3A4A6 /* TrustedServerSettingCell.swift */; };
   54.79 +		158A56502403F043003C0D7E /* ClientCertificateManagementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 158A564F2403F043003C0D7E /* ClientCertificateManagementViewController.swift */; };
   54.80 +		158A56522403F05B003C0D7E /* ClientCertificateManagementViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 158A56512403F05B003C0D7E /* ClientCertificateManagementViewModel.swift */; };
   54.81  		158A6E2F230D53E3006A9ECE /* ExtraKeysSettingViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 158A6E2E230D53E3006A9ECE /* ExtraKeysSettingViewModelTest.swift */; };
   54.82  		15944A30239802D5006B133B /* EmailDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15944A2F239802D5006B133B /* EmailDetailViewController.swift */; };
   54.83  		15944A3223980C99006B133B /* EmailDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15944A3123980C99006B133B /* EmailDetailViewModel.swift */; };
   54.84 @@ -196,7 +195,6 @@
   54.85  		37156E4C234CDDF100845A28 /* EditableAccountSettingsTableViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37156E4B234CDDF100845A28 /* EditableAccountSettingsTableViewModel.swift */; };
   54.86  		37156E4E234DCE2B00845A28 /* UIViewController+LoadingInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37156E4D234DCE2B00845A28 /* UIViewController+LoadingInterface.swift */; };
   54.87  		37156E50234DD3FB00845A28 /* LoadingInterface.xib in Resources */ = {isa = PBXBuildFile; fileRef = 37156E4F234DD3FB00845A28 /* LoadingInterface.xib */; };
   54.88 -		371A7158231D239B008B31F3 /* TutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371A7157231D239B008B31F3 /* TutorialViewController.swift */; };
   54.89  		371A715A231D45D0008B31F3 /* TutorialViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371A7159231D45D0008B31F3 /* TutorialViewModel.swift */; };
   54.90  		371D641D231D17390036AE62 /* StartUpTutorial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371D641C231D17390036AE62 /* StartUpTutorial.swift */; };
   54.91  		371D6420231D17F80036AE62 /* TutorialWizardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371D641F231D17F80036AE62 /* TutorialWizardViewController.swift */; };
   54.92 @@ -210,21 +208,25 @@
   54.93  		3791A46122BA77C900A9E534 /* KeySyncServiceHandshakeDelegateMoc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3791A46022BA77C900A9E534 /* KeySyncServiceHandshakeDelegateMoc.swift */; };
   54.94  		37A710E0233B5AA5001FEAF0 /* UIHelper+PEP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A710DF233B5AA5001FEAF0 /* UIHelper+PEP.swift */; };
   54.95  		37C3C0E62260C64D003E290C /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C3C0E52260C64D003E290C /* Log.swift */; };
   54.96 -		37F615C92386B14A001AAE48 /* LoginScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37F615C82386B14A001AAE48 /* LoginScrollView.swift */; };
   54.97  		37F615CC238BE51F001AAE48 /* ManualAccountSetupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 37F615CB238BE51F001AAE48 /* ManualAccountSetupView.xib */; };
   54.98  		37F615CF238BE584001AAE48 /* ManualAccountSetupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37F615CE238BE584001AAE48 /* ManualAccountSetupView.swift */; };
   54.99  		37FFA7FA234B3C27004229BE /* AnimatedPlaceholderTextfield.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FFA7F9234B3C27004229BE /* AnimatedPlaceholderTextfield.swift */; };
  54.100 +		3A085A6E23FAF4D50013C63E /* pEpHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A085A6D23FAF4D50013C63E /* pEpHeaderView.swift */; };
  54.101  		3A0CBAAD23F5909C00AE200C /* WrappedCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A0CBAAC23F5909C00AE200C /* WrappedCell.swift */; };
  54.102 +		3A2119DF2412515D0030C3E4 /* DynamicHeightScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2119DE2412515D0030C3E4 /* DynamicHeightScrollView.swift */; };
  54.103 +		3A2119E1241251A80030C3E4 /* ClientCertificateManagementTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2119E0241251A70030C3E4 /* ClientCertificateManagementTableViewCell.swift */; };
  54.104 +		3A2119E424125AC60030C3E4 /* Certificates.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3A2119E624125AC60030C3E4 /* Certificates.storyboard */; };
  54.105 +		3AC2B843240E5FD900E08EB3 /* ClientCertificatePasswordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AC2B842240E5FD900E08EB3 /* ClientCertificatePasswordViewController.swift */; };
  54.106 +		3AC2B845240E692600E08EB3 /* ClientCertificatePasswordViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AC2B844240E692600E08EB3 /* ClientCertificatePasswordViewModel.swift */; };
  54.107 +		3AC2B847241021C300E08EB3 /* ClientCertificatePasswordViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AC2B846241021C300E08EB3 /* ClientCertificatePasswordViewModelTest.swift */; };
  54.108  		3AD0E0A123E4659F006FFED3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3AD0E0A023E4659F006FFED3 /* Assets.xcassets */; };
  54.109 +		3AD2CBC923FD92650003A536 /* AccountSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD2CBC823FD92640003A536 /* AccountSettingsViewModel.swift */; };
  54.110  		43040A531E9776220083DED8 /* AttachmentSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43040A521E9776220083DED8 /* AttachmentSummaryView.swift */; };
  54.111 -		4304FD001EBB8EBB0086DADA /* LanguageListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4304FCFE1EBB8C5A0086DADA /* LanguageListViewController.swift */; };
  54.112  		4307D5DA23575853004569C4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4307D5D823575853004569C4 /* InfoPlist.strings */; };
  54.113  		430BA229203438A3003B041C /* CdMessagePEPMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430BA228203438A3003B041C /* CdMessagePEPMessageTests.swift */; };
  54.114  		430C80E01D0EADC200CD4582 /* PepAdapterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430C80DF1D0EADC200CD4582 /* PepAdapterTests.swift */; };
  54.115  		430D73651E9CBD4E00EA6FA9 /* AttachmentsViewOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430D73641E9CBD4E00EA6FA9 /* AttachmentsViewOperation.swift */; };
  54.116 -		430D73671E9CC54000EA6FA9 /* AttachmentToLocalURLOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430D73661E9CC54000EA6FA9 /* AttachmentToLocalURLOperation.swift */; };
  54.117  		430E0BE71EAF5E2600378EC2 /* NSMutableDictionary+pEp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430E0BE61EAF5E2600378EC2 /* NSMutableDictionary+pEp.swift */; };
  54.118 -		430E5F201EBC87A700E5D5D3 /* LanguageListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430E5F1F1EBC87A700E5D5D3 /* LanguageListTableViewCell.swift */; };
  54.119  		43106A192045716000693144 /* OAuth2ConfigurationProtocol+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43106A182045716000693144 /* OAuth2ConfigurationProtocol+Extension.swift */; };
  54.120  		4312BE89228439670002129D /* SecretUITestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4312BE88228439670002129D /* SecretUITestData.swift */; };
  54.121  		4315E4C3201242BB00F68763 /* OAuth2Type+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4315E4C2201242BB00F68763 /* OAuth2Type+Extension.swift */; };
  54.122 @@ -236,7 +238,6 @@
  54.123  		431D60DD1E93D580001266D7 /* MessageAttachmentsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431D60DC1E93D580001266D7 /* MessageAttachmentsCell.swift */; };
  54.124  		431E65631EEAE65200B8BBFC /* HandshakeUITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431E65621EEAE65200B8BBFC /* HandshakeUITest.swift */; };
  54.125  		431E8F7E1CFDCF3A00C33647 /* EmailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431E8F7D1CFDCF3A00C33647 /* EmailViewController.swift */; };
  54.126 -		431F987F1F6FD3E300A1E4D2 /* HandshakePartnerTableViewCellViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431F987E1F6FD3E300A1E4D2 /* HandshakePartnerTableViewCellViewModelTests.swift */; };
  54.127  		4322E82F1F9DE8260011FC55 /* Microsoft_Outlook_Probing_Message_001.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4322E82E1F9DE8260011FC55 /* Microsoft_Outlook_Probing_Message_001.txt */; };
  54.128  		43257C801F50064100DDC7F0 /* HtmlToTextSaxParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43257C7F1F50064100DDC7F0 /* HtmlToTextSaxParser.swift */; };
  54.129  		43257C821F50179800DDC7F0 /* BasicSaxParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43257C811F50179800DDC7F0 /* BasicSaxParser.swift */; };
  54.130 @@ -265,7 +266,6 @@
  54.131  		434AC3E320A450D800C11B7F /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434AC3E220A450D700C11B7F /* UIAlertController+Extension.swift */; };
  54.132  		434C051B20F8BAB6009B271D /* XCUIElement+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434C051A20F8BAB6009B271D /* XCUIElement+Extension.swift */; };
  54.133  		434F40941EB0B173002FBF0D /* ObservableValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F40931EB0B173002FBF0D /* ObservableValue.swift */; };
  54.134 -		434F40961EB0DB5E002FBF0D /* HandshakePartnerTableViewCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F40951EB0DB5E002FBF0D /* HandshakePartnerTableViewCellViewModel.swift */; };
  54.135  		4351C2C81F4441190053381F /* blocks.c in Sources */ = {isa = PBXBuildFile; fileRef = 4351C2B31F4441190053381F /* blocks.c */; };
  54.136  		4351C2C91F4441190053381F /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 4351C2B41F4441190053381F /* buffer.c */; };
  54.137  		4351C2CB1F4441190053381F /* cmark.c in Sources */ = {isa = PBXBuildFile; fileRef = 4351C2B61F4441190053381F /* cmark.c */; };
  54.138 @@ -309,7 +309,6 @@
  54.139  		438BA0F5214F89CD001A4A82 /* MailParsingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438BA0F4214F89CC001A4A82 /* MailParsingTests.swift */; };
  54.140  		438D253C1D4B9E7500BFF7AA /* MimeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D253B1D4B9E7500BFF7AA /* MimeTests.swift */; };
  54.141  		438D25401D4B9EDB00BFF7AA /* PGPMimeMail.txt in Resources */ = {isa = PBXBuildFile; fileRef = 438D253F1D4B9EDB00BFF7AA /* PGPMimeMail.txt */; };
  54.142 -		438D5A711EA77CFC001A37E1 /* HandshakeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438D5A701EA77CFC001A37E1 /* HandshakeViewController.swift */; };
  54.143  		438F4EDF215F9C7B00168B5E /* Rick Deckard (EB50C250) – Private.asc in Resources */ = {isa = PBXBuildFile; fileRef = 438F4EDE215F9C7B00168B5E /* Rick Deckard (EB50C250) – Private.asc */; };
  54.144  		438F4EE1215F9CB300168B5E /* SimplifiedKeyImport_Harry_To_Rick_with_Leon.txt in Resources */ = {isa = PBXBuildFile; fileRef = 438F4EE0215F9CB300168B5E /* SimplifiedKeyImport_Harry_To_Rick_with_Leon.txt */; };
  54.145  		438F4EE5215FAD0500168B5E /* Harry Bryant iostest002@peptest.ch (0x5716EA2D9AE32468) pub-sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 438F4EE4215FAD0500168B5E /* Harry Bryant iostest002@peptest.ch (0x5716EA2D9AE32468) pub-sec.asc */; };
  54.146 @@ -320,6 +319,8 @@
  54.147  		43980E2C1CBD0BC900A7FC3C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43980E2A1CBD0BC900A7FC3C /* Main.storyboard */; };
  54.148  		43980E341CBD0BCA00A7FC3C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43980E321CBD0BCA00A7FC3C /* LaunchScreen.storyboard */; };
  54.149  		43980EFA1CBD415700A7FC3C /* AppConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43980EF91CBD415700A7FC3C /* AppConfig.swift */; };
  54.150 +		439817592418ED2000C8AB84 /* TrustManagement.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4398175B2418ED2000C8AB84 /* TrustManagement.storyboard */; };
  54.151 +		439817692418EDB200C8AB84 /* Tutorial.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4398176B2418EDB200C8AB84 /* Tutorial.storyboard */; };
  54.152  		43985D0A2044296D0080FA9A /* OAuth2AuthViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43985D092044296D0080FA9A /* OAuth2AuthViewModel.swift */; };
  54.153  		43985D0E204438480080FA9A /* AccountSettingsProtocol+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43985D0D204438480080FA9A /* AccountSettingsProtocol+Extension.swift */; };
  54.154  		43A0B2CF214006FC00FB779D /* ReplyUtilTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A0B2CE214006FC00FB779D /* ReplyUtilTests.swift */; };
  54.155 @@ -336,7 +337,6 @@
  54.156  		43B10C801EC2EE7F003E849F /* CppDummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43B10C7F1EC2EE7F003E849F /* CppDummy.cpp */; };
  54.157  		43B2C31B1D2280ED00A08557 /* 5A90_3590_0E48_AB85_F3DB__045E_4623_C5D1_EAB6_643E.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43B2C3161D2280ED00A08557 /* 5A90_3590_0E48_AB85_F3DB__045E_4623_C5D1_EAB6_643E.asc */; };
  54.158  		43B7154D1CECAADA0027861A /* ViewWidthsAligner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B7154C1CECAADA0027861A /* ViewWidthsAligner.swift */; };
  54.159 -		43C322051EA89EED005073FB /* HandshakePartnerTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C322041EA89EED005073FB /* HandshakePartnerTableViewCell.swift */; };
  54.160  		43C322091EA90192005073FB /* PEP+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C322081EA90192005073FB /* PEP+UI.swift */; };
  54.161  		43C3B1622003896800ED48A4 /* IOS-884_001_Mail_from_P4A.txt in Resources */ = {isa = PBXBuildFile; fileRef = 43C3B1612003896800ED48A4 /* IOS-884_001_Mail_from_P4A.txt */; };
  54.162  		43C3B16820038B2500ED48A4 /* IOS-884_001_test010@peptest.ch.pub.key in Resources */ = {isa = PBXBuildFile; fileRef = 43C3B16520038B2500ED48A4 /* IOS-884_001_test010@peptest.ch.pub.key */; };
  54.163 @@ -344,7 +344,6 @@
  54.164  		43C98AC3219C275E006418B0 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 43C98AC1219C275E006418B0 /* Localizable.strings */; };
  54.165  		43D070312133DB920013B120 /* AppSettingsProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D070302133DB920013B120 /* AppSettingsProtocol.swift */; };
  54.166  		43D070332133DC500013B120 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D070322133DC500013B120 /* AppSettings.swift */; };
  54.167 -		43D213342237C8CA00C060A1 /* libAccountSettingsAdapter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D213332237C8CA00C060A1 /* libAccountSettingsAdapter.a */; };
  54.168  		43D2133B2237CABD00C060A1 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 43800D981D112A2A00821E34 /* libxml2.tbd */; };
  54.169  		43D3379021A3F32500E40114 /* ImapUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D3378F21A3F32500E40114 /* ImapUtil.swift */; };
  54.170  		43D3F8A121EDDF19002D5AFC /* ENGINE-456_Mail_PEP_OUT_OF_MEMORY.txt in Resources */ = {isa = PBXBuildFile; fileRef = 43D3F8A021EDDF19002D5AFC /* ENGINE-456_Mail_PEP_OUT_OF_MEMORY.txt */; };
  54.171 @@ -386,32 +385,52 @@
  54.172  		49DCCD2621E8ABD300ABE487 /* nojavascript.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 49DCCD1F21E75BE300ABE487 /* nojavascript.pdf */; };
  54.173  		49DCCD2721E8ABD600ABE487 /* javascript.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 49079D9821E3867900D15A0D /* javascript.pdf */; };
  54.174  		49DCCD2821E8ABDF00ABE487 /* ScreenshotTestUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 495F689921E6600500A10C63 /* ScreenshotTestUtil.swift */; };
  54.175 +		5B1C0E1823FC26FB00F977C1 /* TrustManagementTableViewCellProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1C0E1723FC26FB00F977C1 /* TrustManagementTableViewCellProtocols.swift */; };
  54.176 +		5B2F7E63240D25CF004DDFA2 /* TutorialStepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B2F7E62240D25CF004DDFA2 /* TutorialStepViewController.swift */; };
  54.177 +		5B394E1323ED5673006A1FC0 /* TrustManagementTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B394E1223ED5673006A1FC0 /* TrustManagementTableViewCell.swift */; };
  54.178  		5B3C13BF23D8AF2E00FC0A53 /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B3C13BE23D8AF2E00FC0A53 /* SettingsTableViewController.swift */; };
  54.179 -		5B87D78823F2C56E009DACAA /* SFUIText-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B87D77C23F2C56D009DACAA /* SFUIText-Medium.ttf */; };
  54.180 -		5B87D78923F2C56E009DACAA /* SFUIText-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B87D77D23F2C56D009DACAA /* SFUIText-Regular.ttf */; };
  54.181 -		5B87D78D23F2C56E009DACAA /* SFUIText-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B87D78123F2C56E009DACAA /* SFUIText-Semibold.ttf */; };
  54.182 +		5B41C6082418F15100C268CE /* TutorialStep3ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B41C6072418F15100C268CE /* TutorialStep3ViewController.swift */; };
  54.183 +		5BC14ABF23E2EE78005F0AF3 /* TrustManagementViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC14ABE23E2EE78005F0AF3 /* TrustManagementViewModel.swift */; };
  54.184 +		5BC14AC923E47A55005F0AF3 /* TrustManagementViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC14AC823E47A55005F0AF3 /* TrustManagementViewModelTest.swift */; };
  54.185 +		5BC14AF023EB19B5005F0AF3 /* TrustManagementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC14AEF23EB19B5005F0AF3 /* TrustManagementViewController.swift */; };
  54.186 +		5BC4E5FF240E99C2008C01ED /* CustomTraitCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC4E5FE240E99C2008C01ED /* CustomTraitCollectionViewController.swift */; };
  54.187 +		5BC4E601240FF156008C01ED /* TutorialStep1ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC4E600240FF155008C01ED /* TutorialStep1ViewController.swift */; };
  54.188 +		5BC4E60724113659008C01ED /* TutorialStep2ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC4E60624113659008C01ED /* TutorialStep2ViewController.swift */; };
  54.189 +		5BF449F4240827F500B23E50 /* TutorialStep0ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF449F3240827F500B23E50 /* TutorialStep0ViewController.swift */; };
  54.190 +		5BF9B3D723FAF2BF00EBC945 /* TrustManagementResetTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF9B3D623FAF2BF00EBC945 /* TrustManagementResetTableViewCell.swift */; };
  54.191  		8B69E3991E30F80E0022959E /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B69E3981E30F80E0022959E /* Appearance.swift */; };
  54.192  		A1014DA71D1173CD00C472A8 /* UIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436C5A8D1CFEDF59006A195F /* UIHelper.swift */; };
  54.193  		A1B50A841CD26FF100B1A997 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B50A811CD26FF100B1A997 /* Constants.swift */; };
  54.194  		B70A3A63220065F600EDCE61 /* String+pEp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70A3A62220065F500EDCE61 /* String+pEp.swift */; };
  54.195  		B70A3C401E817CFA0036876F /* FolderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70A3C3F1E817CFA0036876F /* FolderViewModel.swift */; };
  54.196 +		B710526524168400007148E8 /* SwipeCellKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B710526424168400007148E8 /* SwipeCellKit.framework */; };
  54.197 +		B710526624168400007148E8 /* SwipeCellKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B710526424168400007148E8 /* SwipeCellKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  54.198 +		B710526824168474007148E8 /* pEpIOSToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B710526724168474007148E8 /* pEpIOSToolbox.framework */; };
  54.199 +		B710526924168474007148E8 /* pEpIOSToolbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B710526724168474007148E8 /* pEpIOSToolbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  54.200 +		B710526B24168481007148E8 /* AppAuth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B710526A24168481007148E8 /* AppAuth.framework */; };
  54.201 +		B710526C24168481007148E8 /* AppAuth.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B710526A24168481007148E8 /* AppAuth.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  54.202 +		B710526E241684AB007148E8 /* MessageModel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B710526D241684AB007148E8 /* MessageModel.framework */; };
  54.203 +		B710526F241684AB007148E8 /* MessageModel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B710526D241684AB007148E8 /* MessageModel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  54.204 +		B71052732417D0B7007148E8 /* AccountTypeSelectorTextCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B71052722417D0B7007148E8 /* AccountTypeSelectorTextCollectionViewCell.swift */; };
  54.205  		B716056020D3ECC900A733D6 /* MoveToFolderTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B716055F20D3ECC900A733D6 /* MoveToFolderTableViewController.swift */; };
  54.206  		B71EBBBC1E55E4AE00150177 /* FolderTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B71EBBBB1E55E4AE00150177 /* FolderTableViewController.swift */; };
  54.207  		B722EC4D1E5B01B300A2B9D5 /* FolderCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B722EC4C1E5B01B300A2B9D5 /* FolderCellViewModel.swift */; };
  54.208  		B722EC651E5B49BA00A2B9D5 /* FolderSectionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B722EC641E5B49BA00A2B9D5 /* FolderSectionViewModel.swift */; };
  54.209  		B722EC7A1E5C879000A2B9D5 /* FolderUiProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = B722EC791E5C879000A2B9D5 /* FolderUiProtocols.swift */; };
  54.210 -		B72AC87423C494D2009B90B5 /* PerAccountSyncViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72AC87323C494D2009B90B5 /* PerAccountSyncViewController.swift */; };
  54.211 -		B72AC87623C494FE009B90B5 /* PerAccountSyncViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72AC87523C494FE009B90B5 /* PerAccountSyncViewModel.swift */; };
  54.212 -		B72AC87823C4A12A009B90B5 /* PerAccountSyncAccountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72AC87723C4A12A009B90B5 /* PerAccountSyncAccountTableViewCell.swift */; };
  54.213 +		B72C7BAA2395182F0013B12E /* AccountTypeSelectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72C7BA92395182F0013B12E /* AccountTypeSelectorViewController.swift */; };
  54.214 +		B72C7BAC2395198D0013B12E /* AccountTypeSelectorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72C7BAB2395198D0013B12E /* AccountTypeSelectorViewModel.swift */; };
  54.215  		B73123CA23D07739009EDC62 /* SettingsViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B73123C923D07739009EDC62 /* SettingsViewModelTest.swift */; };
  54.216  		B74F81021EB0E20000519FCC /* LoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B74F81011EB0E20000519FCC /* LoginViewModel.swift */; };
  54.217 +		B756E57523ED99FA0007D535 /* AccountTypeSelectorCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B756E57423ED99FA0007D535 /* AccountTypeSelectorCollectionViewCell.swift */; };
  54.218  		B75FF00B1EFD420F00C57289 /* EmailListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B75FF00A1EFD420F00C57289 /* EmailListViewModel.swift */; };
  54.219  		B76CF8B320D2739B002429A8 /* MoveToFolderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B76CF8B220D2739B002429A8 /* MoveToFolderViewModel.swift */; };
  54.220  		B778BB0F23DF040400CFC001 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B778BB0E23DF040400CFC001 /* SettingsViewModel.swift */; };
  54.221  		B78309C81EAA09040051A2E0 /* AccountCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B78309C61EAA09040051A2E0 /* AccountCreation.storyboard */; };
  54.222 +		B78602B12412B6380027132B /* AccountTypeSelectorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B78602B02412B6380027132B /* AccountTypeSelectorTest.swift */; };
  54.223  		B78CF8251E76D706008C1739 /* FilterTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B78CF8241E76D706008C1739 /* FilterTableViewController.swift */; };
  54.224  		B792889A2302D3DE00D2C68B /* Array+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B79288992302D3DE00D2C68B /* Array+Extension.swift */; };
  54.225  		B7A50746224CD27A007B988F /* FilterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A50745224CD27A007B988F /* FilterViewModel.swift */; };
  54.226 +		B7B0E8F324094BB1003A34DC /* SplitViewHandlingProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7B0E8F224094BB1003A34DC /* SplitViewHandlingProtocol.swift */; };
  54.227  		B7C487A122E0B7DE0005304B /* nonPasteableUiTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7C487A022E0B7DE0005304B /* nonPasteableUiTextField.swift */; };
  54.228  		B7C7E3122334E054009ABFFE /* ResetTrustViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7C7E3112334E054009ABFFE /* ResetTrustViewController.swift */; };
  54.229  		B7C7E3142334E7A1009ABFFE /* ResetTrustViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7C7E3132334E7A1009ABFFE /* ResetTrustViewModel.swift */; };
  54.230 @@ -457,13 +476,13 @@
  54.231  			dstPath = "";
  54.232  			dstSubfolderSpec = 10;
  54.233  			files = (
  54.234 -				154918E422BA74D70091B6D6 /* PantomimeFramework.framework in Embed Frameworks */,
  54.235 -				154918E122BA74BA0091B6D6 /* AppAuth.framework in Embed Frameworks */,
  54.236 -				154918D122BA74230091B6D6 /* ldns_xcode.framework in Embed Frameworks */,
  54.237 -				154918DE22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework in Embed Frameworks */,
  54.238 -				154918DB22BA74800091B6D6 /* MessageModel.framework in Embed Frameworks */,
  54.239 -				154918D522BA74670091B6D6 /* pEpIOSToolbox.framework in Embed Frameworks */,
  54.240 -				154918D822BA74700091B6D6 /* SwipeCellKit.framework in Embed Frameworks */,
  54.241 +				B710526C24168481007148E8 /* AppAuth.framework in Embed Frameworks */,
  54.242 +				1512133224166C7B009B7C88 /* PantomimeFramework.framework in Embed Frameworks */,
  54.243 +				1512133E24166CE0009B7C88 /* ldns_xcode.framework in Embed Frameworks */,
  54.244 +				1512133424166C83009B7C88 /* PEPObjCAdapterFramework.framework in Embed Frameworks */,
  54.245 +				B710526F241684AB007148E8 /* MessageModel.framework in Embed Frameworks */,
  54.246 +				B710526924168474007148E8 /* pEpIOSToolbox.framework in Embed Frameworks */,
  54.247 +				B710526624168400007148E8 /* SwipeCellKit.framework in Embed Frameworks */,
  54.248  			);
  54.249  			name = "Embed Frameworks";
  54.250  			runOnlyForDeploymentPostprocessing = 0;
  54.251 @@ -488,7 +507,7 @@
  54.252  		00A12CAD20D3D9AC00B82BE3 /* FullMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FullMessageCell.swift; sourceTree = "<group>"; };
  54.253  		00AEB2F520DBA7DA00DA185A /* NeedsRefreshDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeedsRefreshDelegate.swift; sourceTree = "<group>"; };
  54.254  		00BEC89620B85FD300A36E60 /* NothingSelectedViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NothingSelectedViewController.swift; sourceTree = "<group>"; };
  54.255 -		00D3CD3D20B58976009ABBC9 /* PrimarySplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimarySplitViewController.swift; sourceTree = "<group>"; };
  54.256 +		00D3CD3D20B58976009ABBC9 /* PEPSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PEPSplitViewController.swift; sourceTree = "<group>"; };
  54.257  		00DF2C3A2164C53F004EBA6C /* FolderViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderViewModelTest.swift; sourceTree = "<group>"; };
  54.258  		00EB89AA20E3A27C00CDFA0D /* ThreadViewcontroller+SizeClasses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadViewcontroller+SizeClasses.swift"; sourceTree = "<group>"; };
  54.259  		00EB89AC20E3D3C200CDFA0D /* ThreadedEmailViewModel+MoveToFolderDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadedEmailViewModel+MoveToFolderDelegate.swift"; sourceTree = "<group>"; };
  54.260 @@ -499,14 +518,21 @@
  54.261  		150B8EB21FCEB93D00374438 /* UIUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIUtils.swift; sourceTree = "<group>"; };
  54.262  		150DF6CF2052A13700A9DCF7 /* SecureWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureWebViewController.swift; sourceTree = "<group>"; };
  54.263  		150E18BF219D8C6C009E9048 /* ComposeViewModelSectionTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeViewModelSectionTest.swift; sourceTree = "<group>"; };
  54.264 +		1512132324166A6E009B7C88 /* AccountSettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingsTableViewController.swift; sourceTree = "<group>"; };
  54.265 +		1512132524166AD8009B7C88 /* small-animated-gif.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "small-animated-gif.gif"; sourceTree = "<group>"; };
  54.266 +		1512132624166AD8009B7C88 /* large-animated-gif.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "large-animated-gif.gif"; sourceTree = "<group>"; };
  54.267 +		1512133C24166CDF009B7C88 /* ldns_xcode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ldns_xcode.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.268  		15146C89237EE77A00D69495 /* SettingsInternalError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsInternalError.swift; sourceTree = "<group>"; };
  54.269  		15146C8B237F006F00D69495 /* KeySyncWizardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeySyncWizardViewController.swift; sourceTree = "<group>"; };
  54.270  		15146C90237F07EF00D69495 /* PEPPageViewControllerBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PEPPageViewControllerBase.swift; sourceTree = "<group>"; };
  54.271  		15147EF6237EBE2A003989FE /* AppSettings+KeySyncDeviceGroupStateChangeNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppSettings+KeySyncDeviceGroupStateChangeNotification.swift"; sourceTree = "<group>"; };
  54.272  		15175CEB205929FB00A8D9D0 /* CidHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CidHandler.swift; sourceTree = "<group>"; };
  54.273 +		1517DABA23FD7F88005BAE97 /* pEpForiOS-icon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "pEpForiOS-icon.pdf"; sourceTree = "<group>"; };
  54.274  		151AD7AC219D74C700FC36FF /* ComposeViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeViewModelTest.swift; sourceTree = "<group>"; };
  54.275 +		151C67FC2418158B00481F75 /* SFUIText-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFUIText-Semibold.ttf"; sourceTree = "<group>"; };
  54.276 +		151C67FD2418158B00481F75 /* SFUIText-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFUIText-Regular.ttf"; sourceTree = "<group>"; };
  54.277 +		151C67FE2418158B00481F75 /* SFUIText-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFUIText-Medium.ttf"; sourceTree = "<group>"; };
  54.278  		151DE7DF1FC5D3E200CDC273 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Settings.storyboard; sourceTree = "<group>"; };
  54.279 -		151DE7E21FC5D3FA00CDC273 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Handshake.storyboard; sourceTree = "<group>"; };
  54.280  		151DE7E51FC5D41600CDC273 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/FolderViews.storyboard; sourceTree = "<group>"; };
  54.281  		151F71EC202A06750057C74D /* TestDataBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestDataBase.swift; sourceTree = "<group>"; };
  54.282  		151F71F0202A06750057C74D /* MockBackgrounder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockBackgrounder.swift; sourceTree = "<group>"; };
  54.283 @@ -575,13 +601,6 @@
  54.284  		154660D32334E2FC008D2137 /* Message+SecurityBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Message+SecurityBadge.swift"; sourceTree = "<group>"; };
  54.285  		1549184522B933B90091B6D6 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
  54.286  		1549184622B933B90091B6D6 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
  54.287 -		154918CF22BA74230091B6D6 /* ldns_xcode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ldns_xcode.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.288 -		154918D322BA74670091B6D6 /* pEpIOSToolbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = pEpIOSToolbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.289 -		154918D622BA74700091B6D6 /* SwipeCellKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SwipeCellKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.290 -		154918D922BA74800091B6D6 /* MessageModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MessageModel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.291 -		154918DC22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PEPObjCAdapterFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.292 -		154918DF22BA74BA0091B6D6 /* AppAuth.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppAuth.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.293 -		154918E222BA74D70091B6D6 /* PantomimeFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PantomimeFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.294  		154D173C2373327C001FDF78 /* CoreDataDrivenTestBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataDrivenTestBase.swift; sourceTree = "<group>"; };
  54.295  		155050EF1FE82356009CEAD2 /* UserNotificationTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserNotificationTool.swift; sourceTree = "<group>"; };
  54.296  		155050F11FE95D8A009CEAD2 /* UserNotificationTool+pEp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserNotificationTool+pEp.swift"; sourceTree = "<group>"; };
  54.297 @@ -591,6 +610,7 @@
  54.298  		155F2D9F20530798001B4B1C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Reusable.storyboard; sourceTree = "<group>"; };
  54.299  		15679F0C2292F4090051DCC3 /* FilterViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FilterViewDelegate.swift; path = Filter/ViewModel/FilterViewDelegate.swift; sourceTree = "<group>"; };
  54.300  		1568FEA01FACDCC500993EA3 /* IOS-211_hi_there.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "IOS-211_hi_there.txt"; sourceTree = "<group>"; };
  54.301 +		156D493F23FE953C00EA18A9 /* ClientCertificateUIUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientCertificateUIUtil.swift; sourceTree = "<group>"; };
  54.302  		1574D077211356E000FEDC93 /* UrlClickHandlerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlClickHandlerProtocol.swift; sourceTree = "<group>"; };
  54.303  		1574D079211464CC00FEDC93 /* URL+MailTo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+MailTo.swift"; sourceTree = "<group>"; };
  54.304  		1574D07C2114696B00FEDC93 /* URL+MailToTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+MailToTest.swift"; sourceTree = "<group>"; };
  54.305 @@ -600,12 +620,42 @@
  54.306  		15874BA82127493E00A3A4A6 /* SettingSwitchTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingSwitchTableViewCell.swift; sourceTree = "<group>"; };
  54.307  		15874BB02127493E00A3A4A6 /* SettingDefaultAccountTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingDefaultAccountTableViewController.swift; sourceTree = "<group>"; };
  54.308  		15874BB82127493E00A3A4A6 /* AccountVerificationResultDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountVerificationResultDelegate.swift; sourceTree = "<group>"; };
  54.309 -		15874BB92127493E00A3A4A6 /* AccountSettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingsViewModel.swift; sourceTree = "<group>"; };
  54.310  		15874BBA2127493E00A3A4A6 /* AccountSettingsError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingsError.swift; sourceTree = "<group>"; };
  54.311 -		15874BBC2127493E00A3A4A6 /* AccountSettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingsTableViewController.swift; sourceTree = "<group>"; };
  54.312  		15874BBF2127493E00A3A4A6 /* TrustedServerSettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrustedServerSettingsViewModel.swift; sourceTree = "<group>"; };
  54.313  		15874BC02127493E00A3A4A6 /* TrustedServerSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrustedServerSettingsViewController.swift; sourceTree = "<group>"; };
  54.314  		15874BD321274BD400A3A4A6 /* TrustedServerSettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustedServerSettingCell.swift; sourceTree = "<group>"; };
  54.315 +		158A564F2403F043003C0D7E /* ClientCertificateManagementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientCertificateManagementViewController.swift; sourceTree = "<group>"; };
  54.316 +		158A56512403F05B003C0D7E /* ClientCertificateManagementViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientCertificateManagementViewModel.swift; sourceTree = "<group>"; };
  54.317 +		158A565324052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  54.318 +		158A565424052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
  54.319 +		158A565524052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Main.strings; sourceTree = "<group>"; };
  54.320 +		158A565624052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/NothingSelected.strings; sourceTree = "<group>"; };
  54.321 +		158A565724052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Settings.strings; sourceTree = "<group>"; };
  54.322 +		158A565824052280003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/AccountCreation.strings; sourceTree = "<group>"; };
  54.323 +		158A565A24052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  54.324 +		158A565B24052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/FolderViews.strings; sourceTree = "<group>"; };
  54.325 +		158A565C24052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Reusable.strings; sourceTree = "<group>"; };
  54.326 +		158A565D24052281003C0D7E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Thread.strings; sourceTree = "<group>"; };
  54.327 +		158A565E24052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Main.strings; sourceTree = "<group>"; };
  54.328 +		158A565F24052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/NothingSelected.strings; sourceTree = "<group>"; };
  54.329 +		158A566024052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Settings.strings; sourceTree = "<group>"; };
  54.330 +		158A566124052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/AccountCreation.strings; sourceTree = "<group>"; };
  54.331 +		158A566324052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  54.332 +		158A566424052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/FolderViews.strings; sourceTree = "<group>"; };
  54.333 +		158A566524052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Reusable.strings; sourceTree = "<group>"; };
  54.334 +		158A566624052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Thread.strings; sourceTree = "<group>"; };
  54.335 +		158A566724052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  54.336 +		158A566824052360003C0D7E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
  54.337 +		158A56692405236E003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Main.strings; sourceTree = "<group>"; };
  54.338 +		158A566A2405236E003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/NothingSelected.strings; sourceTree = "<group>"; };
  54.339 +		158A566B2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Settings.strings; sourceTree = "<group>"; };
  54.340 +		158A566C2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/AccountCreation.strings; sourceTree = "<group>"; };
  54.341 +		158A566E2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  54.342 +		158A566F2405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/FolderViews.strings; sourceTree = "<group>"; };
  54.343 +		158A56702405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Reusable.strings; sourceTree = "<group>"; };
  54.344 +		158A56712405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Thread.strings; sourceTree = "<group>"; };
  54.345 +		158A56722405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  54.346 +		158A56732405236F003C0D7E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
  54.347  		158A6E2E230D53E3006A9ECE /* ExtraKeysSettingViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtraKeysSettingViewModelTest.swift; sourceTree = "<group>"; };
  54.348  		15944A2F239802D5006B133B /* EmailDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailDetailViewController.swift; sourceTree = "<group>"; };
  54.349  		15944A3123980C99006B133B /* EmailDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailDetailViewModel.swift; sourceTree = "<group>"; };
  54.350 @@ -618,6 +668,26 @@
  54.351  		15A8B8FB20908D2300D2B0B6 /* Keychain+TestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Keychain+TestUtils.swift"; sourceTree = "<group>"; };
  54.352  		15B2204F1FBF5D6E00CA52BA /* InfoPlist.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoPlist.swift; sourceTree = "<group>"; };
  54.353  		15B220511FC2DAE200CA52BA /* InfoPlist+pEpStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "InfoPlist+pEpStrings.swift"; sourceTree = "<group>"; };
  54.354 +		15B75BE423FB026800DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Main.strings; sourceTree = "<group>"; };
  54.355 +		15B75BE523FB026800DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/NothingSelected.strings; sourceTree = "<group>"; };
  54.356 +		15B75BE623FB026800DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Settings.strings; sourceTree = "<group>"; };
  54.357 +		15B75BE723FB026900DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AccountCreation.strings; sourceTree = "<group>"; };
  54.358 +		15B75BE923FB026900DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  54.359 +		15B75BEA23FB026900DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/FolderViews.strings; sourceTree = "<group>"; };
  54.360 +		15B75BEB23FB026900DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Reusable.strings; sourceTree = "<group>"; };
  54.361 +		15B75BEC23FB026900DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Thread.strings; sourceTree = "<group>"; };
  54.362 +		15B75BED23FB026B00DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  54.363 +		15B75BEE23FB026B00DAE976 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
  54.364 +		15B75BEF23FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
  54.365 +		15B75BF023FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NothingSelected.strings; sourceTree = "<group>"; };
  54.366 +		15B75BF123FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Settings.strings; sourceTree = "<group>"; };
  54.367 +		15B75BF223FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/AccountCreation.strings; sourceTree = "<group>"; };
  54.368 +		15B75BF423FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  54.369 +		15B75BF523FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/FolderViews.strings; sourceTree = "<group>"; };
  54.370 +		15B75BF623FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Reusable.strings; sourceTree = "<group>"; };
  54.371 +		15B75BF723FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Thread.strings; sourceTree = "<group>"; };
  54.372 +		15B75BF823FB027600DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  54.373 +		15B75BF923FB027700DAE976 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
  54.374  		15BA536D20A095410090F126 /* UnifiedInboxTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnifiedInboxTest.swift; sourceTree = "<group>"; };
  54.375  		15BA537B20A1F5F50090F126 /* MoveToAccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoveToAccountViewController.swift; sourceTree = "<group>"; };
  54.376  		15BBBC6A1FD0527200B9DCC8 /* DisplayUserErrorTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayUserErrorTest.swift; sourceTree = "<group>"; };
  54.377 @@ -657,7 +727,6 @@
  54.378  		37156E4B234CDDF100845A28 /* EditableAccountSettingsTableViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableAccountSettingsTableViewModel.swift; sourceTree = "<group>"; };
  54.379  		37156E4D234DCE2B00845A28 /* UIViewController+LoadingInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+LoadingInterface.swift"; sourceTree = "<group>"; };
  54.380  		37156E4F234DD3FB00845A28 /* LoadingInterface.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LoadingInterface.xib; sourceTree = "<group>"; };
  54.381 -		371A7157231D239B008B31F3 /* TutorialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialViewController.swift; sourceTree = "<group>"; };
  54.382  		371A7159231D45D0008B31F3 /* TutorialViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialViewModel.swift; sourceTree = "<group>"; };
  54.383  		371D641C231D17390036AE62 /* StartUpTutorial.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartUpTutorial.swift; sourceTree = "<group>"; };
  54.384  		371D641F231D17F80036AE62 /* TutorialWizardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialWizardViewController.swift; sourceTree = "<group>"; };
  54.385 @@ -671,29 +740,39 @@
  54.386  		37A710DF233B5AA5001FEAF0 /* UIHelper+PEP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIHelper+PEP.swift"; sourceTree = "<group>"; };
  54.387  		37C3C0E52260C64D003E290C /* Log.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = "<group>"; };
  54.388  		37F272EF237075D9005C51AA /* EditableAccountSettingsViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableAccountSettingsViewModelTest.swift; sourceTree = "<group>"; };
  54.389 -		37F615C82386B14A001AAE48 /* LoginScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginScrollView.swift; sourceTree = "<group>"; };
  54.390  		37F615CB238BE51F001AAE48 /* ManualAccountSetupView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ManualAccountSetupView.xib; sourceTree = "<group>"; };
  54.391  		37F615CE238BE584001AAE48 /* ManualAccountSetupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualAccountSetupView.swift; sourceTree = "<group>"; };
  54.392  		37FFA7F9234B3C27004229BE /* AnimatedPlaceholderTextfield.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimatedPlaceholderTextfield.swift; sourceTree = "<group>"; };
  54.393 +		3A085A6D23FAF4D50013C63E /* pEpHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = pEpHeaderView.swift; sourceTree = "<group>"; };
  54.394  		3A0CBAAC23F5909C00AE200C /* WrappedCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WrappedCell.swift; sourceTree = "<group>"; };
  54.395 +		3A2119DE2412515D0030C3E4 /* DynamicHeightScrollView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicHeightScrollView.swift; sourceTree = "<group>"; };
  54.396 +		3A2119E0241251A70030C3E4 /* ClientCertificateManagementTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClientCertificateManagementTableViewCell.swift; sourceTree = "<group>"; };
  54.397 +		3A2119E524125AC60030C3E4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Certificates.storyboard; sourceTree = "<group>"; };
  54.398 +		3A2119E824125ACE0030C3E4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Certificates.strings; sourceTree = "<group>"; };
  54.399 +		3A2119EA24125ACF0030C3E4 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Certificates.strings; sourceTree = "<group>"; };
  54.400 +		3A2119EC24125AD30030C3E4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Certificates.strings; sourceTree = "<group>"; };
  54.401 +		3A2119EE24125AD50030C3E4 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Certificates.strings; sourceTree = "<group>"; };
  54.402 +		3A2119F024125AD60030C3E4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Certificates.strings; sourceTree = "<group>"; };
  54.403 +		3A2119F224125AD70030C3E4 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Certificates.strings; sourceTree = "<group>"; };
  54.404 +		3A2119F424125AD80030C3E4 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Certificates.strings; sourceTree = "<group>"; };
  54.405 +		3AC2B842240E5FD900E08EB3 /* ClientCertificatePasswordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientCertificatePasswordViewController.swift; sourceTree = "<group>"; };
  54.406 +		3AC2B844240E692600E08EB3 /* ClientCertificatePasswordViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientCertificatePasswordViewModel.swift; sourceTree = "<group>"; };
  54.407 +		3AC2B846241021C300E08EB3 /* ClientCertificatePasswordViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientCertificatePasswordViewModelTest.swift; sourceTree = "<group>"; };
  54.408  		3AD0E0A023E4659F006FFED3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
  54.409 +		3AD2CBC823FD92640003A536 /* AccountSettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingsViewModel.swift; sourceTree = "<group>"; };
  54.410  		43040A521E9776220083DED8 /* AttachmentSummaryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentSummaryView.swift; sourceTree = "<group>"; };
  54.411 -		4304FCFE1EBB8C5A0086DADA /* LanguageListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LanguageListViewController.swift; sourceTree = "<group>"; };
  54.412  		4307D5D923575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  54.413  		4307D5DB23575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/FolderViews.strings; sourceTree = "<group>"; };
  54.414  		4307D5DC23575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
  54.415  		4307D5DD23575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AccountCreation.strings; sourceTree = "<group>"; };
  54.416  		4307D5DE23575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Settings.strings; sourceTree = "<group>"; };
  54.417  		4307D5DF23575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Reusable.strings; sourceTree = "<group>"; };
  54.418 -		4307D5E023575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Handshake.strings; sourceTree = "<group>"; };
  54.419  		4307D5E123575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Thread.strings; sourceTree = "<group>"; };
  54.420  		4307D5E223575853004569C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
  54.421  		430BA228203438A3003B041C /* CdMessagePEPMessageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CdMessagePEPMessageTests.swift; sourceTree = "<group>"; };
  54.422  		430C80DF1D0EADC200CD4582 /* PepAdapterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PepAdapterTests.swift; sourceTree = "<group>"; };
  54.423  		430D73641E9CBD4E00EA6FA9 /* AttachmentsViewOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentsViewOperation.swift; sourceTree = "<group>"; };
  54.424 -		430D73661E9CC54000EA6FA9 /* AttachmentToLocalURLOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentToLocalURLOperation.swift; sourceTree = "<group>"; };
  54.425  		430E0BE61EAF5E2600378EC2 /* NSMutableDictionary+pEp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSMutableDictionary+pEp.swift"; sourceTree = "<group>"; };
  54.426 -		430E5F1F1EBC87A700E5D5D3 /* LanguageListTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LanguageListTableViewCell.swift; sourceTree = "<group>"; };
  54.427  		43106A182045716000693144 /* OAuth2ConfigurationProtocol+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OAuth2ConfigurationProtocol+Extension.swift"; sourceTree = "<group>"; };
  54.428  		4312BE88228439670002129D /* SecretUITestData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SecretUITestData.swift; path = ../../pEp_for_iOS_intern/SecretUITestData.swift; sourceTree = "<group>"; };
  54.429  		4315E4C2201242BB00F68763 /* OAuth2Type+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OAuth2Type+Extension.swift"; sourceTree = "<group>"; };
  54.430 @@ -705,7 +784,6 @@
  54.431  		431D60DC1E93D580001266D7 /* MessageAttachmentsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageAttachmentsCell.swift; sourceTree = "<group>"; };
  54.432  		431E65621EEAE65200B8BBFC /* HandshakeUITest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HandshakeUITest.swift; sourceTree = "<group>"; };
  54.433  		431E8F7D1CFDCF3A00C33647 /* EmailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmailViewController.swift; sourceTree = "<group>"; };
  54.434 -		431F987E1F6FD3E300A1E4D2 /* HandshakePartnerTableViewCellViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HandshakePartnerTableViewCellViewModelTests.swift; sourceTree = "<group>"; };
  54.435  		4322E82E1F9DE8260011FC55 /* Microsoft_Outlook_Probing_Message_001.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Microsoft_Outlook_Probing_Message_001.txt; sourceTree = "<group>"; };
  54.436  		43257C7F1F50064100DDC7F0 /* HtmlToTextSaxParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HtmlToTextSaxParser.swift; sourceTree = "<group>"; };
  54.437  		43257C811F50179800DDC7F0 /* BasicSaxParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicSaxParser.swift; sourceTree = "<group>"; };
  54.438 @@ -735,7 +813,6 @@
  54.439  		434AC3E220A450D700C11B7F /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = "<group>"; };
  54.440  		434C051A20F8BAB6009B271D /* XCUIElement+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+Extension.swift"; sourceTree = "<group>"; };
  54.441  		434F40931EB0B173002FBF0D /* ObservableValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObservableValue.swift; sourceTree = "<group>"; };
  54.442 -		434F40951EB0DB5E002FBF0D /* HandshakePartnerTableViewCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HandshakePartnerTableViewCellViewModel.swift; sourceTree = "<group>"; };
  54.443  		4351C2A21F4441190053381F /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = "<group>"; };
  54.444  		4351C2A31F4441190053381F /* chunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chunk.h; sourceTree = "<group>"; };
  54.445  		4351C2A41F4441190053381F /* cmark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cmark.h; sourceTree = "<group>"; };
  54.446 @@ -803,7 +880,6 @@
  54.447  		438BA0F4214F89CC001A4A82 /* MailParsingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailParsingTests.swift; sourceTree = "<group>"; };
  54.448  		438D253B1D4B9E7500BFF7AA /* MimeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MimeTests.swift; sourceTree = "<group>"; };
  54.449  		438D253F1D4B9EDB00BFF7AA /* PGPMimeMail.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PGPMimeMail.txt; sourceTree = "<group>"; };
  54.450 -		438D5A701EA77CFC001A37E1 /* HandshakeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HandshakeViewController.swift; sourceTree = "<group>"; };
  54.451  		438F4EDE215F9C7B00168B5E /* Rick Deckard (EB50C250) – Private.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Rick Deckard (EB50C250) – Private.asc"; sourceTree = "<group>"; };
  54.452  		438F4EE0215F9CB300168B5E /* SimplifiedKeyImport_Harry_To_Rick_with_Leon.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SimplifiedKeyImport_Harry_To_Rick_with_Leon.txt; sourceTree = "<group>"; };
  54.453  		438F4EE4215FAD0500168B5E /* Harry Bryant iostest002@peptest.ch (0x5716EA2D9AE32468) pub-sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Harry Bryant iostest002@peptest.ch (0x5716EA2D9AE32468) pub-sec.asc"; sourceTree = "<group>"; };
  54.454 @@ -821,6 +897,26 @@
  54.455  		43980E4B1CBD0BCA00A7FC3C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
  54.456  		43980EEA1CBD24F100A7FC3C /* pEpForiOS-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "pEpForiOS-Bridging-Header.h"; sourceTree = "<group>"; };
  54.457  		43980EF91CBD415700A7FC3C /* AppConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppConfig.swift; sourceTree = "<group>"; };
  54.458 +		439817522418ECA700C8AB84 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NothingSelected.strings; sourceTree = "<group>"; };
  54.459 +		439817542418ECA800C8AB84 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/NothingSelected.strings; sourceTree = "<group>"; };
  54.460 +		439817562418ECC400C8AB84 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  54.461 +		439817582418ECC600C8AB84 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  54.462 +		4398175C2418ED2F00C8AB84 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/TrustManagement.storyboard; sourceTree = "<group>"; };
  54.463 +		4398175E2418ED3100C8AB84 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/TrustManagement.strings; sourceTree = "<group>"; };
  54.464 +		439817602418ED3500C8AB84 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/TrustManagement.strings; sourceTree = "<group>"; };
  54.465 +		439817622418ED3A00C8AB84 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/TrustManagement.strings; sourceTree = "<group>"; };
  54.466 +		439817642418ED3B00C8AB84 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/TrustManagement.strings; sourceTree = "<group>"; };
  54.467 +		439817662418ED3F00C8AB84 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/TrustManagement.strings; sourceTree = "<group>"; };
  54.468 +		439817682418ED4400C8AB84 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/TrustManagement.strings; sourceTree = "<group>"; };
  54.469 +		4398176C2418EDCC00C8AB84 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Tutorial.storyboard; sourceTree = "<group>"; };
  54.470 +		4398176E2418EDD000C8AB84 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Tutorial.strings; sourceTree = "<group>"; };
  54.471 +		439817702418EDD200C8AB84 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Tutorial.strings; sourceTree = "<group>"; };
  54.472 +		439817722418EDD500C8AB84 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Tutorial.strings; sourceTree = "<group>"; };
  54.473 +		439817742418EDD700C8AB84 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Tutorial.strings; sourceTree = "<group>"; };
  54.474 +		439817762418EDD900C8AB84 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Tutorial.strings; sourceTree = "<group>"; };
  54.475 +		439817782418EDDB00C8AB84 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Tutorial.strings; sourceTree = "<group>"; };
  54.476 +		439817792418F06000C8AB84 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Tutorial.strings; sourceTree = "<group>"; };
  54.477 +		4398177A2418F06A00C8AB84 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/TrustManagement.strings; sourceTree = "<group>"; };
  54.478  		43985D092044296D0080FA9A /* OAuth2AuthViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuth2AuthViewModel.swift; sourceTree = "<group>"; };
  54.479  		43985D0D204438480080FA9A /* AccountSettingsProtocol+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AccountSettingsProtocol+Extension.swift"; sourceTree = "<group>"; };
  54.480  		43993C2F2357587700FE311E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  54.481 @@ -838,7 +934,6 @@
  54.482  		43B10C7F1EC2EE7F003E849F /* CppDummy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CppDummy.cpp; sourceTree = "<group>"; };
  54.483  		43B2C3161D2280ED00A08557 /* 5A90_3590_0E48_AB85_F3DB__045E_4623_C5D1_EAB6_643E.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5A90_3590_0E48_AB85_F3DB__045E_4623_C5D1_EAB6_643E.asc; sourceTree = "<group>"; };
  54.484  		43B7154C1CECAADA0027861A /* ViewWidthsAligner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewWidthsAligner.swift; sourceTree = "<group>"; };
  54.485 -		43C322041EA89EED005073FB /* HandshakePartnerTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HandshakePartnerTableViewCell.swift; sourceTree = "<group>"; };
  54.486  		43C322081EA90192005073FB /* PEP+UI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PEP+UI.swift"; sourceTree = "<group>"; };
  54.487  		43C3B1612003896800ED48A4 /* IOS-884_001_Mail_from_P4A.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "IOS-884_001_Mail_from_P4A.txt"; sourceTree = "<group>"; };
  54.488  		43C3B16520038B2500ED48A4 /* IOS-884_001_test010@peptest.ch.pub.key */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "IOS-884_001_test010@peptest.ch.pub.key"; sourceTree = "<group>"; };
  54.489 @@ -847,7 +942,6 @@
  54.490  		43C98AC0219C22E8006418B0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Settings.strings; sourceTree = "<group>"; };
  54.491  		43C98AC2219C275E006418B0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
  54.492  		43C98AC4219C275E006418B0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
  54.493 -		43C98AC8219C3691006418B0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Handshake.strings; sourceTree = "<group>"; };
  54.494  		43D070302133DB920013B120 /* AppSettingsProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettingsProtocol.swift; sourceTree = "<group>"; };
  54.495  		43D070322133DC500013B120 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
  54.496  		43D213332237C8CA00C060A1 /* libAccountSettingsAdapter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libAccountSettingsAdapter.a; sourceTree = BUILT_PRODUCTS_DIR; };
  54.497 @@ -893,31 +987,47 @@
  54.498  		49C34AF520E4F649009D11CC /* CellDetailTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CellDetailTransition.swift; sourceTree = "<group>"; };
  54.499  		49D3BECB20F8F7330043E05D /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
  54.500  		49DCCD1F21E75BE300ABE487 /* nojavascript.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = nojavascript.pdf; sourceTree = "<group>"; };
  54.501 +		5B1C0E1723FC26FB00F977C1 /* TrustManagementTableViewCellProtocols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustManagementTableViewCellProtocols.swift; sourceTree = "<group>"; };
  54.502 +		5B2F7E62240D25CF004DDFA2 /* TutorialStepViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialStepViewController.swift; sourceTree = "<group>"; };
  54.503 +		5B394E1223ED5673006A1FC0 /* TrustManagementTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustManagementTableViewCell.swift; sourceTree = "<group>"; };
  54.504  		5B3C13BE23D8AF2E00FC0A53 /* SettingsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = "<group>"; };
  54.505 -		5B87D77C23F2C56D009DACAA /* SFUIText-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFUIText-Medium.ttf"; sourceTree = "<group>"; };
  54.506 -		5B87D77D23F2C56D009DACAA /* SFUIText-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFUIText-Regular.ttf"; sourceTree = "<group>"; };
  54.507 -		5B87D78123F2C56E009DACAA /* SFUIText-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFUIText-Semibold.ttf"; sourceTree = "<group>"; };
  54.508 +		5B41C6072418F15100C268CE /* TutorialStep3ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialStep3ViewController.swift; sourceTree = "<group>"; };
  54.509 +		5BC14ABE23E2EE78005F0AF3 /* TrustManagementViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustManagementViewModel.swift; sourceTree = "<group>"; };
  54.510 +		5BC14AC823E47A55005F0AF3 /* TrustManagementViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustManagementViewModelTest.swift; sourceTree = "<group>"; };
  54.511 +		5BC14AEF23EB19B5005F0AF3 /* TrustManagementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustManagementViewController.swift; sourceTree = "<group>"; };
  54.512 +		5BC4E5FE240E99C2008C01ED /* CustomTraitCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTraitCollectionViewController.swift; sourceTree = "<group>"; };
  54.513 +		5BC4E600240FF155008C01ED /* TutorialStep1ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialStep1ViewController.swift; sourceTree = "<group>"; };
  54.514 +		5BC4E60624113659008C01ED /* TutorialStep2ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialStep2ViewController.swift; sourceTree = "<group>"; };
  54.515 +		5BF449F3240827F500B23E50 /* TutorialStep0ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialStep0ViewController.swift; sourceTree = "<group>"; };
  54.516 +		5BF9B3D623FAF2BF00EBC945 /* TrustManagementResetTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustManagementResetTableViewCell.swift; sourceTree = "<group>"; };
  54.517  		8B69E3981E30F80E0022959E /* Appearance.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
  54.518  		A1B50A811CD26FF100B1A997 /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
  54.519  		B70A3A62220065F500EDCE61 /* String+pEp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+pEp.swift"; sourceTree = "<group>"; };
  54.520  		B70A3C3F1E817CFA0036876F /* FolderViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FolderViewModel.swift; path = Folder/ViewModel/FolderViewModel.swift; sourceTree = "<group>"; };
  54.521 +		B710526424168400007148E8 /* SwipeCellKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SwipeCellKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.522 +		B710526724168474007148E8 /* pEpIOSToolbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = pEpIOSToolbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.523 +		B710526A24168481007148E8 /* AppAuth.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppAuth.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.524 +		B710526D241684AB007148E8 /* MessageModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MessageModel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  54.525 +		B71052722417D0B7007148E8 /* AccountTypeSelectorTextCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTypeSelectorTextCollectionViewCell.swift; sourceTree = "<group>"; };
  54.526  		B716055F20D3ECC900A733D6 /* MoveToFolderTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoveToFolderTableViewController.swift; sourceTree = "<group>"; };
  54.527  		B71EBBBB1E55E4AE00150177 /* FolderTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FolderTableViewController.swift; path = Folder/FolderTableViewController.swift; sourceTree = "<group>"; };
  54.528  		B722EC4C1E5B01B300A2B9D5 /* FolderCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FolderCellViewModel.swift; path = Folder/ViewModel/FolderCellViewModel.swift; sourceTree = "<group>"; };
  54.529  		B722EC641E5B49BA00A2B9D5 /* FolderSectionViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FolderSectionViewModel.swift; path = Folder/ViewModel/FolderSectionViewModel.swift; sourceTree = "<group>"; };
  54.530  		B722EC791E5C879000A2B9D5 /* FolderUiProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderUiProtocols.swift; sourceTree = "<group>"; };
  54.531 -		B72AC87323C494D2009B90B5 /* PerAccountSyncViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerAccountSyncViewController.swift; sourceTree = "<group>"; };
  54.532 -		B72AC87523C494FE009B90B5 /* PerAccountSyncViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerAccountSyncViewModel.swift; sourceTree = "<group>"; };
  54.533 -		B72AC87723C4A12A009B90B5 /* PerAccountSyncAccountTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerAccountSyncAccountTableViewCell.swift; sourceTree = "<group>"; };
  54.534 +		B72C7BA92395182F0013B12E /* AccountTypeSelectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTypeSelectorViewController.swift; sourceTree = "<group>"; };
  54.535 +		B72C7BAB2395198D0013B12E /* AccountTypeSelectorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTypeSelectorViewModel.swift; sourceTree = "<group>"; };
  54.536  		B73123C923D07739009EDC62 /* SettingsViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewModelTest.swift; sourceTree = "<group>"; };
  54.537  		B74F81011EB0E20000519FCC /* LoginViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginViewModel.swift; sourceTree = "<group>"; };
  54.538 +		B756E57423ED99FA0007D535 /* AccountTypeSelectorCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTypeSelectorCollectionViewCell.swift; sourceTree = "<group>"; };
  54.539  		B75FF00A1EFD420F00C57289 /* EmailListViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmailListViewModel.swift; sourceTree = "<group>"; };
  54.540  		B76CF8B220D2739B002429A8 /* MoveToFolderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoveToFolderViewModel.swift; sourceTree = "<group>"; };
  54.541  		B778BB0E23DF040400CFC001 /* SettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewModel.swift; sourceTree = "<group>"; };
  54.542  		B78309C71EAA09040051A2E0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/AccountCreation.storyboard; sourceTree = "<group>"; };
  54.543 +		B78602B02412B6380027132B /* AccountTypeSelectorTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTypeSelectorTest.swift; sourceTree = "<group>"; };
  54.544  		B78CF8241E76D706008C1739 /* FilterTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FilterTableViewController.swift; path = Filter/FilterTableViewController.swift; sourceTree = "<group>"; };
  54.545  		B79288992302D3DE00D2C68B /* Array+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+Extension.swift"; sourceTree = "<group>"; };
  54.546  		B7A50745224CD27A007B988F /* FilterViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FilterViewModel.swift; path = Filter/ViewModel/FilterViewModel.swift; sourceTree = "<group>"; };
  54.547 +		B7B0E8F224094BB1003A34DC /* SplitViewHandlingProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitViewHandlingProtocol.swift; sourceTree = "<group>"; };
  54.548  		B7C487A022E0B7DE0005304B /* nonPasteableUiTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = nonPasteableUiTextField.swift; sourceTree = "<group>"; };
  54.549  		B7C7E3112334E054009ABFFE /* ResetTrustViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetTrustViewController.swift; sourceTree = "<group>"; };
  54.550  		B7C7E3132334E7A1009ABFFE /* ResetTrustViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetTrustViewModel.swift; sourceTree = "<group>"; };
  54.551 @@ -944,15 +1054,15 @@
  54.552  			isa = PBXFrameworksBuildPhase;
  54.553  			buildActionMask = 2147483647;
  54.554  			files = (
  54.555 -				154918E322BA74D70091B6D6 /* PantomimeFramework.framework in Frameworks */,
  54.556 -				154918E022BA74BA0091B6D6 /* AppAuth.framework in Frameworks */,
  54.557 -				154918D022BA74230091B6D6 /* ldns_xcode.framework in Frameworks */,
  54.558 -				154918DD22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework in Frameworks */,
  54.559 -				154918DA22BA74800091B6D6 /* MessageModel.framework in Frameworks */,
  54.560 -				154918D422BA74670091B6D6 /* pEpIOSToolbox.framework in Frameworks */,
  54.561 -				154918D722BA74700091B6D6 /* SwipeCellKit.framework in Frameworks */,
  54.562 -				43D213342237C8CA00C060A1 /* libAccountSettingsAdapter.a in Frameworks */,
  54.563 +				B710526524168400007148E8 /* SwipeCellKit.framework in Frameworks */,
  54.564 +				1512133524166C95009B7C88 /* libAccountSettingsAdapter.a in Frameworks */,
  54.565 +				B710526824168474007148E8 /* pEpIOSToolbox.framework in Frameworks */,
  54.566 +				1512133124166C7B009B7C88 /* PantomimeFramework.framework in Frameworks */,
  54.567 +				1512133D24166CE0009B7C88 /* ldns_xcode.framework in Frameworks */,
  54.568 +				1512133324166C83009B7C88 /* PEPObjCAdapterFramework.framework in Frameworks */,
  54.569  				43D2133B2237CABD00C060A1 /* libxml2.tbd in Frameworks */,
  54.570 +				B710526E241684AB007148E8 /* MessageModel.framework in Frameworks */,
  54.571 +				B710526B24168481007148E8 /* AppAuth.framework in Frameworks */,
  54.572  			);
  54.573  			runOnlyForDeploymentPostprocessing = 0;
  54.574  		};
  54.575 @@ -988,9 +1098,10 @@
  54.576  		003C0FAA20B57C2E0093A987 /* SplitView */ = {
  54.577  			isa = PBXGroup;
  54.578  			children = (
  54.579 -				00D3CD3D20B58976009ABBC9 /* PrimarySplitViewController.swift */,
  54.580 +				00D3CD3D20B58976009ABBC9 /* PEPSplitViewController.swift */,
  54.581  				00BEC89620B85FD300A36E60 /* NothingSelectedViewController.swift */,
  54.582  				00FD0CE52101F7D700BA0C56 /* ScreenComposerProtocol.swift */,
  54.583 +				B7B0E8F224094BB1003A34DC /* SplitViewHandlingProtocol.swift */,
  54.584  			);
  54.585  			path = SplitView;
  54.586  			sourceTree = "<group>";
  54.587 @@ -1306,6 +1417,8 @@
  54.588  		1543B69F22AAC882002B59AB /* Resources */ = {
  54.589  			isa = PBXGroup;
  54.590  			children = (
  54.591 +				432E80FA2191AF5100359879 /* Fonts */,
  54.592 +				1517DABA23FD7F88005BAE97 /* pEpForiOS-icon.pdf */,
  54.593  				1543B6A322AACD69002B59AB /* secret.xcconfig */,
  54.594  				3AD0E0A023E4659F006FFED3 /* Assets.xcassets */,
  54.595  				4388A0E02008AF61008CB98D /* public.xcconfig */,
  54.596 @@ -1344,6 +1457,7 @@
  54.597  		1574D07B2114694F00FEDC93 /* Extensions */ = {
  54.598  			isa = PBXGroup;
  54.599  			children = (
  54.600 +				4395CDED20AAC909003FC5F1 /* UIImageExtensionsTests.swift */,
  54.601  				1574D07C2114696B00FEDC93 /* URL+MailToTest.swift */,
  54.602  			);
  54.603  			path = Extensions;
  54.604 @@ -1416,7 +1530,7 @@
  54.605  		15874BAF2127493E00A3A4A6 /* Setting */ = {
  54.606  			isa = PBXGroup;
  54.607  			children = (
  54.608 -				B72AC87223C4947B009B90B5 /* KeySyncSettings */,
  54.609 +				3A085A6F23FAF4DC0013C63E /* Reusable */,
  54.610  				B7C7E3102334E028009ABFFE /* TrustSetting */,
  54.611  				43EC75AA2164C24800048CFE /* SetOwnKey */,
  54.612  				15874BB02127493E00A3A4A6 /* SettingDefaultAccountTableViewController.swift */,
  54.613 @@ -1430,9 +1544,9 @@
  54.614  		15874BB62127493E00A3A4A6 /* AccountSettings */ = {
  54.615  			isa = PBXGroup;
  54.616  			children = (
  54.617 +				1512132324166A6E009B7C88 /* AccountSettingsTableViewController.swift */,
  54.618  				37156E42234CD43600845A28 /* EditableAccountSettings */,
  54.619  				15874BB72127493E00A3A4A6 /* ViewModel */,
  54.620 -				15874BBC2127493E00A3A4A6 /* AccountSettingsTableViewController.swift */,
  54.621  			);
  54.622  			path = AccountSettings;
  54.623  			sourceTree = "<group>";
  54.624 @@ -1440,8 +1554,8 @@
  54.625  		15874BB72127493E00A3A4A6 /* ViewModel */ = {
  54.626  			isa = PBXGroup;
  54.627  			children = (
  54.628 +				3AD2CBC823FD92640003A536 /* AccountSettingsViewModel.swift */,
  54.629  				15874BB82127493E00A3A4A6 /* AccountVerificationResultDelegate.swift */,
  54.630 -				15874BB92127493E00A3A4A6 /* AccountSettingsViewModel.swift */,
  54.631  				15874BBA2127493E00A3A4A6 /* AccountSettingsError.swift */,
  54.632  			);
  54.633  			path = ViewModel;
  54.634 @@ -1457,6 +1571,18 @@
  54.635  			path = TrustedServerSetting;
  54.636  			sourceTree = "<group>";
  54.637  		};
  54.638 +		158A564E2403F00A003C0D7E /* ClientCertificateManagement */ = {
  54.639 +			isa = PBXGroup;
  54.640 +			children = (
  54.641 +				3A2119E0241251A70030C3E4 /* ClientCertificateManagementTableViewCell.swift */,
  54.642 +				158A564F2403F043003C0D7E /* ClientCertificateManagementViewController.swift */,
  54.643 +				158A56512403F05B003C0D7E /* ClientCertificateManagementViewModel.swift */,
  54.644 +				3AC2B842240E5FD900E08EB3 /* ClientCertificatePasswordViewController.swift */,
  54.645 +				3AC2B844240E692600E08EB3 /* ClientCertificatePasswordViewModel.swift */,
  54.646 +			);
  54.647 +			path = ClientCertificateManagement;
  54.648 +			sourceTree = "<group>";
  54.649 +		};
  54.650  		158A6E2B230D53B8006A9ECE /* Settings */ = {
  54.651  			isa = PBXGroup;
  54.652  			children = (
  54.653 @@ -1681,7 +1807,12 @@
  54.654  		371D641E231D17A80036AE62 /* TutorialWizard */ = {
  54.655  			isa = PBXGroup;
  54.656  			children = (
  54.657 -				371A7157231D239B008B31F3 /* TutorialViewController.swift */,
  54.658 +				5BF449F3240827F500B23E50 /* TutorialStep0ViewController.swift */,
  54.659 +				5BC4E600240FF155008C01ED /* TutorialStep1ViewController.swift */,
  54.660 +				5BC4E60624113659008C01ED /* TutorialStep2ViewController.swift */,
  54.661 +				5B41C6072418F15100C268CE /* TutorialStep3ViewController.swift */,
  54.662 +				5B2F7E62240D25CF004DDFA2 /* TutorialStepViewController.swift */,
  54.663 +				5BC4E5FE240E99C2008C01ED /* CustomTraitCollectionViewController.swift */,
  54.664  				371D641F231D17F80036AE62 /* TutorialWizardViewController.swift */,
  54.665  				371A7159231D45D0008B31F3 /* TutorialViewModel.swift */,
  54.666  			);
  54.667 @@ -1738,20 +1869,18 @@
  54.668  			path = EditableAccountSettingsTableViewModel;
  54.669  			sourceTree = "<group>";
  54.670  		};
  54.671 -		4304FCFD1EBB8C2C0086DADA /* LanguageList */ = {
  54.672 +		3A085A6F23FAF4DC0013C63E /* Reusable */ = {
  54.673  			isa = PBXGroup;
  54.674  			children = (
  54.675 -				B70D32A7205BCC2D0094A92A /* CellsAndSections */,
  54.676 -				4304FCFE1EBB8C5A0086DADA /* LanguageListViewController.swift */,
  54.677 +				3A085A6D23FAF4D50013C63E /* pEpHeaderView.swift */,
  54.678  			);
  54.679 -			path = LanguageList;
  54.680 +			path = Reusable;
  54.681  			sourceTree = "<group>";
  54.682  		};
  54.683  		430D73601E9CBD0600EA6FA9 /* Background */ = {
  54.684  			isa = PBXGroup;
  54.685  			children = (
  54.686  				430D73641E9CBD4E00EA6FA9 /* AttachmentsViewOperation.swift */,
  54.687 -				430D73661E9CC54000EA6FA9 /* AttachmentToLocalURLOperation.swift */,
  54.688  			);
  54.689  			path = Background;
  54.690  			sourceTree = "<group>";
  54.691 @@ -1798,20 +1927,6 @@
  54.692  			path = OAuth2;
  54.693  			sourceTree = "<group>";
  54.694  		};
  54.695 -		4339F8C022DE129E00644A8E /* Recovered References */ = {
  54.696 -			isa = PBXGroup;
  54.697 -			children = (
  54.698 -				154918E222BA74D70091B6D6 /* PantomimeFramework.framework */,
  54.699 -				154918DF22BA74BA0091B6D6 /* AppAuth.framework */,
  54.700 -				154918CF22BA74230091B6D6 /* ldns_xcode.framework */,
  54.701 -				154918DC22BA74A90091B6D6 /* PEPObjCAdapterFramework.framework */,
  54.702 -				154918D922BA74800091B6D6 /* MessageModel.framework */,
  54.703 -				154918D322BA74670091B6D6 /* pEpIOSToolbox.framework */,
  54.704 -				154918D622BA74700091B6D6 /* SwipeCellKit.framework */,
  54.705 -			);
  54.706 -			name = "Recovered References";
  54.707 -			sourceTree = "<group>";
  54.708 -		};
  54.709  		4351C2A01F4441190053381F /* Markdown */ = {
  54.710  			isa = PBXGroup;
  54.711  			children = (
  54.712 @@ -1911,15 +2026,14 @@
  54.713  			path = HTMLParser;
  54.714  			sourceTree = "<group>";
  54.715  		};
  54.716 -		438D5A6F1EA77CFC001A37E1 /* Handshake */ = {
  54.717 +		438D5A6F1EA77CFC001A37E1 /* TrustManagement */ = {
  54.718  			isa = PBXGroup;
  54.719  			children = (
  54.720 -				4304FCFD1EBB8C2C0086DADA /* LanguageList */,
  54.721  				B70D32A6205BCC120094A92A /* CellsAndSections */,
  54.722 -				B70D32A5205BCC020094A92A /* ViewModel */,
  54.723 -				438D5A701EA77CFC001A37E1 /* HandshakeViewController.swift */,
  54.724 +				5BC14AEF23EB19B5005F0AF3 /* TrustManagementViewController.swift */,
  54.725 +				5BC14ABE23E2EE78005F0AF3 /* TrustManagementViewModel.swift */,
  54.726  			);
  54.727 -			path = Handshake;
  54.728 +			path = TrustManagement;
  54.729  			sourceTree = "<group>";
  54.730  		};
  54.731  		43980E1A1CBD0BC900A7FC3C = {
  54.732 @@ -1931,7 +2045,6 @@
  54.733  				43980E481CBD0BCA00A7FC3C /* pEpForiOSUITests */,
  54.734  				43980E241CBD0BC900A7FC3C /* Products */,
  54.735  				495560841E7150ED0016579E /* Frameworks */,
  54.736 -				4339F8C022DE129E00644A8E /* Recovered References */,
  54.737  			);
  54.738  			sourceTree = "<group>";
  54.739  		};
  54.740 @@ -1988,11 +2101,10 @@
  54.741  				432A24D61DE714A200DAAC5C /* MessagePantomimeTests.swift */,
  54.742  				438281821E891B7E00087343 /* DateTests.swift */,
  54.743  				43F7F0791F6AD44600BDF151 /* HandshakeTests.swift */,
  54.744 -				431F987E1F6FD3E300A1E4D2 /* HandshakePartnerTableViewCellViewModelTests.swift */,
  54.745 +				5BC14AC823E47A55005F0AF3 /* TrustManagementViewModelTest.swift */,
  54.746  				1541D7EF1FC81ED900D52A5D /* URL+ExtensionsTest.swift */,
  54.747  				1541D7F41FC82A4900D52A5D /* URL+MIME.swift */,
  54.748  				430BA228203438A3003B041C /* CdMessagePEPMessageTests.swift */,
  54.749 -				4395CDED20AAC909003FC5F1 /* UIImageExtensionsTests.swift */,
  54.750  				438BA0F4214F89CC001A4A82 /* MailParsingTests.swift */,
  54.751  			);
  54.752  			path = pEpForiOSTests;
  54.753 @@ -2048,6 +2160,7 @@
  54.754  				15D43998216E695500EB3933 /* AccountPicker */,
  54.755  				15265973216234C0006A78DF /* SuggestTableViewController */,
  54.756  				150DF6D12052A99800A9DCF7 /* SecureWebViewController */,
  54.757 +				3A2119DE2412515D0030C3E4 /* DynamicHeightScrollView.swift */,
  54.758  				37FFA7F9234B3C27004229BE /* AnimatedPlaceholderTextfield.swift */,
  54.759  				B7DB7FD1221AD332003968DA /* SegueHandlerType.swift */,
  54.760  				43C322081EA90192005073FB /* PEP+UI.swift */,
  54.761 @@ -2067,7 +2180,7 @@
  54.762  				B7DFEA51225368670080A2BA /* VirtualFolder.swift */,
  54.763  				B7DFEA5322536D5E0080A2BA /* UnifiedInbox.swift */,
  54.764  				3705096B22DC8C1800CB73D6 /* KeyInputView.swift */,
  54.765 -				37F615C82386B14A001AAE48 /* LoginScrollView.swift */,
  54.766 +				156D493F23FE953C00EA18A9 /* ClientCertificateUIUtil.swift */,
  54.767  			);
  54.768  			path = Util;
  54.769  			sourceTree = "<group>";
  54.770 @@ -2083,6 +2196,8 @@
  54.771  		43B2C3151D2280ED00A08557 /* Resources */ = {
  54.772  			isa = PBXGroup;
  54.773  			children = (
  54.774 +				1512132624166AD8009B7C88 /* large-animated-gif.gif */,
  54.775 +				1512132524166AD8009B7C88 /* small-animated-gif.gif */,
  54.776  				436D0065215B5F3800966CC2 /* Undisplayable_HTML_Message.txt */,
  54.777  				43A384802153E4BF006AC8F8 /* 8B691AD204E22FD1BF018E0D6C9EAD5A798018D1_pub_sec.txt */,
  54.778  				15EBE44020E5353D00268859 /* unittest_ios_3_peptest_ch_550A_9E62_6822_040E_57CB_151A_651C_4A5D_B15B_77A3_pub.asc */,
  54.779 @@ -2171,6 +2286,7 @@
  54.780  		43ED53611CC77F95006AB156 /* UI */ = {
  54.781  			isa = PBXGroup;
  54.782  			children = (
  54.783 +				158A564E2403F00A003C0D7E /* ClientCertificateManagement */,
  54.784  				B706C0EF1EA8C378006B2F6C /* StoryboardFiles */,
  54.785  				15146C8F237F030A00D69495 /* BaseClasses */,
  54.786  				37816540230EC66F00B967E3 /* PEPAlert */,
  54.787 @@ -2181,8 +2297,7 @@
  54.788  				B70D32B0205BCFBD0094A92A /* EmailDisplay */,
  54.789  				B78CF8261E76D70D008C1739 /* Filter */,
  54.790  				B71EBBB41E55E43100150177 /* Folder */,
  54.791 -				432E80FA2191AF5100359879 /* Fonts */,
  54.792 -				438D5A6F1EA77CFC001A37E1 /* Handshake */,
  54.793 +				438D5A6F1EA77CFC001A37E1 /* TrustManagement */,
  54.794  				B70D32AA205BCCC70094A92A /* Login */,
  54.795  				B70D32AF205BCF460094A92A /* ManualLogin */,
  54.796  				15BA537A20A1F5CA0090F126 /* MoveToFolder */,
  54.797 @@ -2234,6 +2349,8 @@
  54.798  				4918EBFA1E783C70006207FC /* CdMessage+PantomimeTest.swift */,
  54.799  				431C2B161F387C4100D87FFD /* LoginViewModelTests.swift */,
  54.800  				491116BC216E0DF4005A42D2 /* MessageViewModelTests.swift */,
  54.801 +				3AC2B846241021C300E08EB3 /* ClientCertificatePasswordViewModelTest.swift */,
  54.802 +				B78602B02412B6380027132B /* AccountTypeSelectorTest.swift */,
  54.803  			);
  54.804  			path = Models;
  54.805  			sourceTree = "<group>";
  54.806 @@ -2268,10 +2385,15 @@
  54.807  		495560841E7150ED0016579E /* Frameworks */ = {
  54.808  			isa = PBXGroup;
  54.809  			children = (
  54.810 +				1512133C24166CDF009B7C88 /* ldns_xcode.framework */,
  54.811  				159E1F1422BD0756007D711F /* PEPObjCAdapterFramework.framework */,
  54.812  				159E1F1222BD074F007D711F /* PantomimeFramework.framework */,
  54.813  				1549184422B933AA0091B6D6 /* AppleiOSSDK */,
  54.814  				439D40781CC78A2D009A4E7C /* Raw */,
  54.815 +				B710526424168400007148E8 /* SwipeCellKit.framework */,
  54.816 +				B710526A24168481007148E8 /* AppAuth.framework */,
  54.817 +				B710526724168474007148E8 /* pEpIOSToolbox.framework */,
  54.818 +				B710526D241684AB007148E8 /* MessageModel.framework */,
  54.819  				43D213332237C8CA00C060A1 /* libAccountSettingsAdapter.a */,
  54.820  			);
  54.821  			name = Frameworks;
  54.822 @@ -2311,9 +2433,9 @@
  54.823  		5B87D79223F2C57F009DACAA /* SF */ = {
  54.824  			isa = PBXGroup;
  54.825  			children = (
  54.826 -				5B87D77C23F2C56D009DACAA /* SFUIText-Medium.ttf */,
  54.827 -				5B87D77D23F2C56D009DACAA /* SFUIText-Regular.ttf */,
  54.828 -				5B87D78123F2C56E009DACAA /* SFUIText-Semibold.ttf */,
  54.829 +				151C67FE2418158B00481F75 /* SFUIText-Medium.ttf */,
  54.830 +				151C67FD2418158B00481F75 /* SFUIText-Regular.ttf */,
  54.831 +				151C67FC2418158B00481F75 /* SFUIText-Semibold.ttf */,
  54.832  			);
  54.833  			path = SF;
  54.834  			sourceTree = "<group>";
  54.835 @@ -2325,36 +2447,24 @@
  54.836  				433404CD2379789600E785F1 /* NothingSelected.storyboard */,
  54.837  				151DE7E01FC5D3E200CDC273 /* Settings.storyboard */,
  54.838  				B78309C61EAA09040051A2E0 /* AccountCreation.storyboard */,
  54.839 -				151DE7E31FC5D3FA00CDC273 /* Handshake.storyboard */,
  54.840 +				4398175B2418ED2000C8AB84 /* TrustManagement.storyboard */,
  54.841  				43980E321CBD0BCA00A7FC3C /* LaunchScreen.storyboard */,
  54.842  				151DE7E61FC5D41600CDC273 /* FolderViews.storyboard */,
  54.843  				155F2DA020530798001B4B1C /* Reusable.storyboard */,
  54.844 +				4398176B2418EDB200C8AB84 /* Tutorial.storyboard */,
  54.845  				491B656020CFE0FD00C2ADDA /* Thread.storyboard */,
  54.846 +				3A2119E624125AC60030C3E4 /* Certificates.storyboard */,
  54.847  			);
  54.848  			name = StoryboardFiles;
  54.849  			path = ..;
  54.850  			sourceTree = "<group>";
  54.851  		};
  54.852 -		B70D32A5205BCC020094A92A /* ViewModel */ = {
  54.853 -			isa = PBXGroup;
  54.854 -			children = (
  54.855 -				434F40951EB0DB5E002FBF0D /* HandshakePartnerTableViewCellViewModel.swift */,
  54.856 -			);
  54.857 -			path = ViewModel;
  54.858 -			sourceTree = "<group>";
  54.859 -		};
  54.860  		B70D32A6205BCC120094A92A /* CellsAndSections */ = {
  54.861  			isa = PBXGroup;
  54.862  			children = (
  54.863 -				43C322041EA89EED005073FB /* HandshakePartnerTableViewCell.swift */,
  54.864 -			);
  54.865 -			path = CellsAndSections;
  54.866 -			sourceTree = "<group>";
  54.867 -		};
  54.868 -		B70D32A7205BCC2D0094A92A /* CellsAndSections */ = {
  54.869 -			isa = PBXGroup;
  54.870 -			children = (
  54.871 -				430E5F1F1EBC87A700E5D5D3 /* LanguageListTableViewCell.swift */,
  54.872 +				5B394E1223ED5673006A1FC0 /* TrustManagementTableViewCell.swift */,
  54.873 +				5B1C0E1723FC26FB00F977C1 /* TrustManagementTableViewCellProtocols.swift */,
  54.874 +				5BF9B3D623FAF2BF00EBC945 /* TrustManagementResetTableViewCell.swift */,
  54.875  			);
  54.876  			path = CellsAndSections;
  54.877  			sourceTree = "<group>";
  54.878 @@ -2364,6 +2474,9 @@
  54.879  			children = (
  54.880  				B70D32AB205BCCDD0094A92A /* ViewModel */,
  54.881  				49D3BECB20F8F7330043E05D /* LoginViewController.swift */,
  54.882 +				B72C7BA92395182F0013B12E /* AccountTypeSelectorViewController.swift */,
  54.883 +				B756E57423ED99FA0007D535 /* AccountTypeSelectorCollectionViewCell.swift */,
  54.884 +				B71052722417D0B7007148E8 /* AccountTypeSelectorTextCollectionViewCell.swift */,
  54.885  			);
  54.886  			path = Login;
  54.887  			sourceTree = "<group>";
  54.888 @@ -2375,6 +2488,7 @@
  54.889  				43498CDA200CF20F006DC947 /* LoginViewModelLoginErrorDelegate.swift */,
  54.890  				43985D092044296D0080FA9A /* OAuth2AuthViewModel.swift */,
  54.891  				B74F81011EB0E20000519FCC /* LoginViewModel.swift */,
  54.892 +				B72C7BAB2395198D0013B12E /* AccountTypeSelectorViewModel.swift */,
  54.893  			);
  54.894  			path = ViewModel;
  54.895  			sourceTree = "<group>";
  54.896 @@ -2461,32 +2575,6 @@
  54.897  			name = CellsAndSections;
  54.898  			sourceTree = "<group>";
  54.899  		};
  54.900 -		B72AC87223C4947B009B90B5 /* KeySyncSettings */ = {
  54.901 -			isa = PBXGroup;
  54.902 -			children = (
  54.903 -				B72E192223C7614200CBC841 /* PerAccountSetting */,
  54.904 -			);
  54.905 -			path = KeySyncSettings;
  54.906 -			sourceTree = "<group>";
  54.907 -		};
  54.908 -		B72AC87923C4A13B009B90B5 /* ViewModel */ = {
  54.909 -			isa = PBXGroup;
  54.910 -			children = (
  54.911 -				B72AC87523C494FE009B90B5 /* PerAccountSyncViewModel.swift */,
  54.912 -			);
  54.913 -			path = ViewModel;
  54.914 -			sourceTree = "<group>";
  54.915 -		};
  54.916 -		B72E192223C7614200CBC841 /* PerAccountSetting */ = {
  54.917 -			isa = PBXGroup;
  54.918 -			children = (
  54.919 -				B72AC87723C4A12A009B90B5 /* PerAccountSyncAccountTableViewCell.swift */,
  54.920 -				B72AC87323C494D2009B90B5 /* PerAccountSyncViewController.swift */,
  54.921 -				B72AC87923C4A13B009B90B5 /* ViewModel */,
  54.922 -			);
  54.923 -			path = PerAccountSetting;
  54.924 -			sourceTree = "<group>";
  54.925 -		};
  54.926  		B74D08BF1F013F15003D092C /* ViewModel */ = {
  54.927  			isa = PBXGroup;
  54.928  			children = (
  54.929 @@ -2673,6 +2761,11 @@
  54.930  				en,
  54.931  				Base,
  54.932  				de,
  54.933 +				fr,
  54.934 +				es,
  54.935 +				nl,
  54.936 +				ca,
  54.937 +				tr,
  54.938  			);
  54.939  			mainGroup = 43980E1A1CBD0BC900A7FC3C;
  54.940  			productRefGroup = 43980E241CBD0BC900A7FC3C /* Products */;
  54.941 @@ -2691,29 +2784,31 @@
  54.942  			isa = PBXResourcesBuildPhase;
  54.943  			buildActionMask = 2147483647;
  54.944  			files = (
  54.945 -				5B87D78823F2C56E009DACAA /* SFUIText-Medium.ttf in Resources */,
  54.946  				491B656220CFE0FD00C2ADDA /* Thread.storyboard in Resources */,
  54.947 +				439817692418EDB200C8AB84 /* Tutorial.storyboard in Resources */,
  54.948  				1526596C216230B1006A78DF /* ComposeData.plist in Resources */,
  54.949 +				151C68002418158B00481F75 /* SFUIText-Regular.ttf in Resources */,
  54.950  				43980E341CBD0BCA00A7FC3C /* LaunchScreen.storyboard in Resources */,
  54.951  				155F2D9E20530798001B4B1C /* Reusable.storyboard in Resources */,
  54.952 -				5B87D78D23F2C56E009DACAA /* SFUIText-Semibold.ttf in Resources */,
  54.953  				220DCE2F1E0AB544002FE716 /* MessageData.plist in Resources */,
  54.954  				432E80FE2191AF5100359879 /* UniversLTStd-Bold.otf in Resources */,
  54.955  				4307D5DA23575853004569C4 /* InfoPlist.strings in Resources */,
  54.956  				37F615CC238BE51F001AAE48 /* ManualAccountSetupView.xib in Resources */,
  54.957 +				439817592418ED2000C8AB84 /* TrustManagement.storyboard in Resources */,
  54.958  				151DE7E41FC5D41600CDC273 /* FolderViews.storyboard in Resources */,
  54.959  				152A39D221905C3E00D9F8E4 /* AttachmentCell.xib in Resources */,
  54.960  				B78309C81EAA09040051A2E0 /* AccountCreation.storyboard in Resources */,
  54.961  				37156E50234DD3FB00845A28 /* LoadingInterface.xib in Resources */,
  54.962 +				151C67FF2418158B00481F75 /* SFUIText-Semibold.ttf in Resources */,
  54.963  				433404CB2379789600E785F1 /* NothingSelected.storyboard in Resources */,
  54.964 -				5B87D78923F2C56E009DACAA /* SFUIText-Regular.ttf in Resources */,
  54.965  				43C98AC3219C275E006418B0 /* Localizable.strings in Resources */,
  54.966 +				3A2119E424125AC60030C3E4 /* Certificates.storyboard in Resources */,
  54.967  				3AD0E0A123E4659F006FFED3 /* Assets.xcassets in Resources */,
  54.968 -				151DE7E11FC5D3FA00CDC273 /* Handshake.storyboard in Resources */,
  54.969  				43980E2C1CBD0BC900A7FC3C /* Main.storyboard in Resources */,
  54.970  				432E80FD2191AF5100359879 /* UniversLTStd.otf in Resources */,
  54.971  				15D3D48C239FC14700F2EBFB /* EmailDetailCollectionViewCell.xib in Resources */,
  54.972  				151DE7DE1FC5D3E200CDC273 /* Settings.storyboard in Resources */,
  54.973 +				151C68012418158B00481F75 /* SFUIText-Medium.ttf in Resources */,
  54.974  			);
  54.975  			runOnlyForDeploymentPostprocessing = 0;
  54.976  		};
  54.977 @@ -2743,6 +2838,7 @@
  54.978  				438F4EDF215F9C7B00168B5E /* Rick Deckard (EB50C250) – Private.asc in Resources */,
  54.979  				43C3B1622003896800ED48A4 /* IOS-884_001_Mail_from_P4A.txt in Resources */,
  54.980  				43DFB0331E36083D00175C9C /* MessageHeapBufferOverflow.txt in Resources */,
  54.981 +				1512132824166AD9009B7C88 /* large-animated-gif.gif in Resources */,
  54.982  				43A5DE381D631D49001153AF /* UnencryptedHTMLMail.txt in Resources */,
  54.983  				438F4EE5215FAD0500168B5E /* Harry Bryant iostest002@peptest.ch (0x5716EA2D9AE32468) pub-sec.asc in Resources */,
  54.984  				153CA6EA1FB62195003C9629 /* IOS-211-pdfEmail.txt in Resources */,
  54.985 @@ -2757,6 +2853,7 @@
  54.986  				43D3F8A121EDDF19002D5AFC /* ENGINE-456_Mail_PEP_OUT_OF_MEMORY.txt in Resources */,
  54.987  				153CA6E81FB61B53003C9629 /* IOS-815_pep_rating_zero.txt in Resources */,
  54.988  				436795FC1EE98E9900B03E23 /* CommunicationTypeTests_test002@peptest.ch.asc in Resources */,
  54.989 +				1512132724166AD9009B7C88 /* small-animated-gif.gif in Resources */,
  54.990  				43A384812153E4BF006AC8F8 /* 8B691AD204E22FD1BF018E0D6C9EAD5A798018D1_pub_sec.txt in Resources */,
  54.991  			);
  54.992  			runOnlyForDeploymentPostprocessing = 0;
  54.993 @@ -2844,31 +2941,32 @@
  54.994  				220DCE341E0AB5CC002FE716 /* MailinglistCell.swift in Sources */,
  54.995  				43AA825D1E9BD60600ABD5A8 /* AttachmentsViewDelegate.swift in Sources */,
  54.996  				152A39D821905C3E00D9F8E4 /* BodyCellViewModel.swift in Sources */,
  54.997 +				5BF449F4240827F500B23E50 /* TutorialStep0ViewController.swift in Sources */,
  54.998  				B7C7E3142334E7A1009ABFFE /* ResetTrustViewModel.swift in Sources */,
  54.999 +				B72C7BAC2395198D0013B12E /* AccountTypeSelectorViewModel.swift in Sources */,
 54.1000  				B792889A2302D3DE00D2C68B /* Array+Extension.swift in Sources */,
 54.1001  				220DCE371E0AB5CC002FE716 /* MessageSubjectCell.swift in Sources */,
 54.1002  				1526596F216230B2006A78DF /* ComposeFieldModel.swift in Sources */,
 54.1003  				492EF92D20C6957D004EAE14 /* ThreadViewController.swift in Sources */,
 54.1004 +				5BC14AF023EB19B5005F0AF3 /* TrustManagementViewController.swift in Sources */,
 54.1005  				3A0CBAAD23F5909C00AE200C /* WrappedCell.swift in Sources */,
 54.1006  				43257C821F50179800DDC7F0 /* BasicSaxParser.swift in Sources */,
 54.1007  				150DF6D02052A13700A9DCF7 /* SecureWebViewController.swift in Sources */,
 54.1008  				375BA08A238BFC4100BBFE7C /* ManualAccountSetupContainerView.swift in Sources */,
 54.1009  				4351C2D71F4441190053381F /* node.c in Sources */,
 54.1010  				154660D42334E2FC008D2137 /* Message+SecurityBadge.swift in Sources */,
 54.1011 -				00D3CD3E20B58976009ABBC9 /* PrimarySplitViewController.swift in Sources */,
 54.1012 +				00D3CD3E20B58976009ABBC9 /* PEPSplitViewController.swift in Sources */,
 54.1013  				B7DFEA56225397AB0080A2BA /* Folder+LocalizedName.swift in Sources */,
 54.1014  				4351C2D51F4441190053381F /* latex.c in Sources */,
 54.1015  				37156E4C234CDDF100845A28 /* EditableAccountSettingsTableViewModel.swift in Sources */,
 54.1016  				37816546230EE5F700B967E3 /* PEPUIAlertAction.swift in Sources */,
 54.1017  				43498CDB200CF20F006DC947 /* LoginViewModelLoginErrorDelegate.swift in Sources */,
 54.1018 -				438D5A711EA77CFC001A37E1 /* HandshakeViewController.swift in Sources */,
 54.1019  				B7DB7FDA221ADDAF003968DA /* UIBarButtonItem+Extension.swift in Sources */,
 54.1020  				002375D320DCDC7300663961 /* FullMessageCell+SecureWebViewControllerDelegate.swift in Sources */,
 54.1021  				4351C2C91F4441190053381F /* buffer.c in Sources */,
 54.1022  				152A39C621905C3E00D9F8E4 /* ComposeViewModelState.swift in Sources */,
 54.1023  				B7DFEA5422536D5E0080A2BA /* UnifiedInbox.swift in Sources */,
 54.1024  				4334CF302020CFFE00B3193E /* OAuth2Type+LibAccountSettings.swift in Sources */,
 54.1025 -				B72AC87423C494D2009B90B5 /* PerAccountSyncViewController.swift in Sources */,
 54.1026  				371D641D231D17390036AE62 /* StartUpTutorial.swift in Sources */,
 54.1027  				37033E9B231AD8FE008DD6F0 /* KeySyncErrorView.swift in Sources */,
 54.1028  				00A12CAE20D3D9AC00B82BE3 /* FullMessageCell.swift in Sources */,
 54.1029 @@ -2880,13 +2978,16 @@
 54.1030  				43AAC22A1F7A5AEE00F435F4 /* BaseTableViewController.swift in Sources */,
 54.1031  				152295542302F72900204FD3 /* ExtraKeysSettingViewController.swift in Sources */,
 54.1032  				220DCE351E0AB5CC002FE716 /* MessageContentCell.swift in Sources */,
 54.1033 +				158A56522403F05B003C0D7E /* ClientCertificateManagementViewModel.swift in Sources */,
 54.1034  				1526597A21623652006A78DF /* SuggestViewModel.swift in Sources */,
 54.1035  				4351C2D31F4441190053381F /* inlines.c in Sources */,
 54.1036 +				5B41C6082418F15100C268CE /* TutorialStep3ViewController.swift in Sources */,
 54.1037  				220DCE361E0AB5CC002FE716 /* MessageSenderCell.swift in Sources */,
 54.1038  				15874BCD2127493E00A3A4A6 /* AccountSettingsError.swift in Sources */,
 54.1039  				15147EF7237EBE2A003989FE /* AppSettings+KeySyncDeviceGroupStateChangeNotification.swift in Sources */,
 54.1040  				B778BB0F23DF040400CFC001 /* SettingsViewModel.swift in Sources */,
 54.1041  				15D4399A216E697700EB3933 /* AccountPickerView.swift in Sources */,
 54.1042 +				B756E57523ED99FA0007D535 /* AccountTypeSelectorCollectionViewCell.swift in Sources */,
 54.1043  				37A710E0233B5AA5001FEAF0 /* UIHelper+PEP.swift in Sources */,
 54.1044  				15265962216230B1006A78DF /* ContactCell.swift in Sources */,
 54.1045  				43425EDF1FE3E052004A2728 /* OAuth2ProviderFactory.swift in Sources */,
 54.1046 @@ -2906,18 +3007,22 @@
 54.1047  				220DCE2E1E0AB544002FE716 /* MessageCell.swift in Sources */,
 54.1048  				B7DB7FD8221AD3BB003968DA /* UITableView+Extension.swift in Sources */,
 54.1049  				8B69E3991E30F80E0022959E /* Appearance.swift in Sources */,
 54.1050 +				3A2119E1241251A80030C3E4 /* ClientCertificateManagementTableViewCell.swift in Sources */,
 54.1051  				B716056020D3ECC900A733D6 /* MoveToFolderTableViewController.swift in Sources */,
 54.1052  				1543B6B022ABF53C002B59AB /* KeySyncDeviceGroupUtil.swift in Sources */,
 54.1053  				15874BCB2127493E00A3A4A6 /* AccountVerificationResultDelegate.swift in Sources */,
 54.1054  				43E657E71F3CAB310014CBEC /* HtmlToMarkdownSaxParser.swift in Sources */,
 54.1055 +				5BC4E601240FF156008C01ED /* TutorialStep1ViewController.swift in Sources */,
 54.1056  				43E1619120D7B2D6003F1514 /* UpdateThreadListDelegate.swift in Sources */,
 54.1057  				155475642137FD96005A52D0 /* FolderType+Extensions.swift in Sources */,
 54.1058  				37156E48234CDD4A00845A28 /* EditableAccountSettingsTableViewController.swift in Sources */,
 54.1059  				1543B6A222AACA4E002B59AB /* KeySyncHandshakeService.swift in Sources */,
 54.1060 +				3AC2B843240E5FD900E08EB3 /* ClientCertificatePasswordViewController.swift in Sources */,
 54.1061  				159AB56D23539D67008AB1F3 /* AppSettings+CNContactsAccessPermissionProvider.swift in Sources */,
 54.1062  				43E657D11F3C33C30014CBEC /* String+HTML.swift in Sources */,
 54.1063  				15146C8C237F006F00D69495 /* KeySyncWizardViewController.swift in Sources */,
 54.1064  				B70A3A63220065F600EDCE61 /* String+pEp.swift in Sources */,
 54.1065 +				5B1C0E1823FC26FB00F977C1 /* TrustManagementTableViewCellProtocols.swift in Sources */,
 54.1066  				15874BC12127493E00A3A4A6 /* SettingSwitchTableViewCell.swift in Sources */,
 54.1067  				152A39E721905C3E00D9F8E4 /* RecipientTextViewModel.swift in Sources */,
 54.1068  				4351C2D41F4441190053381F /* iterator.c in Sources */,
 54.1069 @@ -2932,15 +3037,18 @@
 54.1070  				434AC3E320A450D800C11B7F /* UIAlertController+Extension.swift in Sources */,
 54.1071  				152A39C921905C3E00D9F8E4 /* Message+ComposeUtils.swift in Sources */,
 54.1072  				438052891FE3E24400ACF729 /* OAuth2AuthorizationProtocol.swift in Sources */,
 54.1073 +				B71052732417D0B7007148E8 /* AccountTypeSelectorTextCollectionViewCell.swift in Sources */,
 54.1074  				43B0444C20077323007BCE3F /* OAuth2Configuration.swift in Sources */,
 54.1075  				43257C801F50064100DDC7F0 /* HtmlToTextSaxParser.swift in Sources */,
 54.1076  				431C2B191F38888B00D87FFD /* ConnectionTransport+AccountSettings.swift in Sources */,
 54.1077 +				158A56502403F043003C0D7E /* ClientCertificateManagementViewController.swift in Sources */,
 54.1078  				00EB89AF20E3E4A000CDFA0D /* ReplyAlertCreator.swift in Sources */,
 54.1079  				B7C7E3122334E054009ABFFE /* ResetTrustViewController.swift in Sources */,
 54.1080  				B78CF8251E76D706008C1739 /* FilterTableViewController.swift in Sources */,
 54.1081  				222B35581DF96389007A1F82 /* Capability.swift in Sources */,
 54.1082  				0033C07F20D7EBD500224E61 /* ThreadedEmailViewModel+UpdateThreadDelegate.swift in Sources */,
 54.1083  				15175CEC205929FB00A8D9D0 /* CidHandler.swift in Sources */,
 54.1084 +				3A2119DF2412515D0030C3E4 /* DynamicHeightScrollView.swift in Sources */,
 54.1085  				152A39CB21905C3E00D9F8E4 /* DocumentAttachmentPickerViewModel.swift in Sources */,
 54.1086  				43AAC22B1F7A5AEE00F435F4 /* BaseViewController.swift in Sources */,
 54.1087  				43B7154D1CECAADA0027861A /* ViewWidthsAligner.swift in Sources */,
 54.1088 @@ -2958,6 +3066,7 @@
 54.1089  				43ED536F1CC77F95006AB156 /* EmailListViewCell.swift in Sources */,
 54.1090  				4351C2C81F4441190053381F /* blocks.c in Sources */,
 54.1091  				15BBBC6C1FD05F4300B9DCC8 /* DisplayUserError.swift in Sources */,
 54.1092 +				B72C7BAA2395182F0013B12E /* AccountTypeSelectorViewController.swift in Sources */,
 54.1093  				43A469FA21513B10002E1036 /* PEPSwipeTableViewCell.swift in Sources */,
 54.1094  				00BEC89720B85FD300A36E60 /* NothingSelectedViewController.swift in Sources */,
 54.1095  				431C6E041FE7A85200E23BE0 /* OAuth2ConfigurationProtocol.swift in Sources */,
 54.1096 @@ -2965,11 +3074,11 @@
 54.1097  				152A39D421905C3E00D9F8E4 /* SubjectCell.swift in Sources */,
 54.1098  				B7DB7FD2221AD332003968DA /* SegueHandlerType.swift in Sources */,
 54.1099  				0033C08320D7F41600224E61 /* ThreadedEmailViewModelDelegate.swift in Sources */,
 54.1100 -				B72AC87623C494FE009B90B5 /* PerAccountSyncViewModel.swift in Sources */,
 54.1101  				43498CDD200D0790006DC947 /* LoginViewModelOAuth2ErrorDelegate.swift in Sources */,
 54.1102  				152A39DF21905C3E00D9F8E4 /* WrappedBccViewModel.swift in Sources */,
 54.1103  				B74F81021EB0E20000519FCC /* LoginViewModel.swift in Sources */,
 54.1104  				B7DFEA52225368670080A2BA /* VirtualFolder.swift in Sources */,
 54.1105 +				5B2F7E63240D25CF004DDFA2 /* TutorialStepViewController.swift in Sources */,
 54.1106  				B722EC7A1E5C879000A2B9D5 /* FolderUiProtocols.swift in Sources */,
 54.1107  				A1B50A841CD26FF100B1A997 /* Constants.swift in Sources */,
 54.1108  				37F615CF238BE584001AAE48 /* ManualAccountSetupView.swift in Sources */,
 54.1109 @@ -2979,6 +3088,7 @@
 54.1110  				15679F0D2292F4090051DCC3 /* FilterViewDelegate.swift in Sources */,
 54.1111  				433E7438225B564400B84CD9 /* Account+Extension.swift in Sources */,
 54.1112  				005A21FB20CAA5F50082D19F /* ThreadedEmailViewModel.swift in Sources */,
 54.1113 +				3A085A6E23FAF4D50013C63E /* pEpHeaderView.swift in Sources */,
 54.1114  				15874BD12127493E00A3A4A6 /* TrustedServerSettingsViewModel.swift in Sources */,
 54.1115  				4351C2DC1F4441190053381F /* xml.c in Sources */,
 54.1116  				430E0BE71EAF5E2600378EC2 /* NSMutableDictionary+pEp.swift in Sources */,
 54.1117 @@ -2999,7 +3109,6 @@
 54.1118  				4351C2CF1F4441190053381F /* houdini_href_e.c in Sources */,
 54.1119  				4351C2D01F4441190053381F /* houdini_html_e.c in Sources */,
 54.1120  				15D7D992219B154000A1A2B9 /* Attachment+Extensions.swift in Sources */,
 54.1121 -				15874BCC2127493E00A3A4A6 /* AccountSettingsViewModel.swift in Sources */,
 54.1122  				434F40941EB0B173002FBF0D /* ObservableValue.swift in Sources */,
 54.1123  				B7DB7FC42215C4FF003968DA /* UINavigationController+Extensions.swift in Sources */,
 54.1124  				15944A3523980FEC006B133B /* EmailDisplayViewModel.swift in Sources */,
 54.1125 @@ -3007,10 +3116,10 @@
 54.1126  				15944A3223980C99006B133B /* EmailDetailViewModel.swift in Sources */,
 54.1127  				B7DB7FC82215C57F003968DA /* UIView+Util.swift in Sources */,
 54.1128  				152A39CC21905C3E00D9F8E4 /* MediaAttachmentPickerProvider.swift in Sources */,
 54.1129 +				5BC4E60724113659008C01ED /* TutorialStep2ViewController.swift in Sources */,
 54.1130  				4351C2CD1F4441190053381F /* commonmark.c in Sources */,
 54.1131  				B722EC651E5B49BA00A2B9D5 /* FolderSectionViewModel.swift in Sources */,
 54.1132  				490CEBA72100EAD500E8579C /* SelfDismissable.swift in Sources */,
 54.1133 -				371A7158231D239B008B31F3 /* TutorialViewController.swift in Sources */,
 54.1134  				152A39E321905C3E00D9F8E4 /* RecipientTextView.swift in Sources */,
 54.1135  				43ED53701CC77F95006AB156 /* EmailListViewController.swift in Sources */,
 54.1136  				152A39DD21905C3E00D9F8E4 /* AccountCell.swift in Sources */,
 54.1137 @@ -3020,28 +3129,24 @@
 54.1138  				43306EC21FE129840045DD00 /* OAuth2Type.swift in Sources */,
 54.1139  				438052871FE3E1B100ACF729 /* OAuth2AuthorizationFactoryProtocol.swift in Sources */,
 54.1140  				4356FFE52135448600804089 /* ReplyAllPossibleChecker.swift in Sources */,
 54.1141 -				B72AC87823C4A12A009B90B5 /* PerAccountSyncAccountTableViewCell.swift in Sources */,
 54.1142  				15146C8A237EE77A00D69495 /* SettingsInternalError.swift in Sources */,
 54.1143  				15255B031F825CD100A2CFC9 /* IdentityImageTool.swift in Sources */,
 54.1144  				152A39D121905C3E00D9F8E4 /* AttachmentViewModel.swift in Sources */,
 54.1145  				4330278E1F7BABFF00D685F8 /* GradientView.swift in Sources */,
 54.1146 -				434F40961EB0DB5E002FBF0D /* HandshakePartnerTableViewCellViewModel.swift in Sources */,
 54.1147 +				3AD2CBC923FD92650003A536 /* AccountSettingsViewModel.swift in Sources */,
 54.1148  				152A39E121905C3E00D9F8E4 /* RecipientCellViewModel+FieldType.swift in Sources */,
 54.1149  				4351C2CC1F4441190053381F /* cmark_ctype.c in Sources */,
 54.1150  				152A39DB21905C3E00D9F8E4 /* CellViewModel.swift in Sources */,
 54.1151  				15944A30239802D5006B133B /* EmailDetailViewController.swift in Sources */,
 54.1152  				155050F01FE82356009CEAD2 /* UserNotificationTool.swift in Sources */,
 54.1153 -				430D73671E9CC54000EA6FA9 /* AttachmentToLocalURLOperation.swift in Sources */,
 54.1154  				37156E44234CD47C00845A28 /* EditableAccountSettingsViewController.swift in Sources */,
 54.1155  				4351C2D21F4441190053381F /* html.c in Sources */,
 54.1156 +				156D494023FE953C00EA18A9 /* ClientCertificateUIUtil.swift in Sources */,
 54.1157  				152A39DE21905C3E00D9F8E4 /* AccountCellViewModel.swift in Sources */,
 54.1158 -				4304FD001EBB8EBB0086DADA /* LanguageListViewController.swift in Sources */,
 54.1159 -				430E5F201EBC87A700E5D5D3 /* LanguageListTableViewCell.swift in Sources */,
 54.1160  				49D3BECC20F8F7330043E05D /* LoginViewController.swift in Sources */,
 54.1161  				43425EDB1FE3DE6E004A2728 /* OAuth2ProviderProtocol.swift in Sources */,
 54.1162  				1526596A216230B1006A78DF /* ComposeDataSource.swift in Sources */,
 54.1163  				43106A192045716000693144 /* OAuth2ConfigurationProtocol+Extension.swift in Sources */,
 54.1164 -				43C322051EA89EED005073FB /* HandshakePartnerTableViewCell.swift in Sources */,
 54.1165  				152A39C521905C3E00D9F8E4 /* ComposeTableViewController.swift in Sources */,
 54.1166  				150B8E991FCDACBB00374438 /* AccountSettingsUserInputError.swift in Sources */,
 54.1167  				4351C2DE1F4457620053381F /* NSString+Markdown.m in Sources */,
 54.1168 @@ -3056,16 +3161,18 @@
 54.1169  				43F9D99A1E92725700F78A1C /* AttachmentsViewHelper.swift in Sources */,
 54.1170  				43B10C801EC2EE7F003E849F /* CppDummy.cpp in Sources */,
 54.1171  				B7C487A122E0B7DE0005304B /* nonPasteableUiTextField.swift in Sources */,
 54.1172 +				5BF9B3D723FAF2BF00EBC945 /* TrustManagementResetTableViewCell.swift in Sources */,
 54.1173  				37156E46234CD49F00845A28 /* EditableAccountSettingsViewModel.swift in Sources */,
 54.1174  				15B220501FBF5D6E00CA52BA /* InfoPlist.swift in Sources */,
 54.1175  				15874BD421274BD400A3A4A6 /* TrustedServerSettingCell.swift in Sources */,
 54.1176  				A1014DA71D1173CD00C472A8 /* UIHelper.swift in Sources */,
 54.1177  				3705096622CF688F00CB73D6 /* KeySyncHandshakeViewModel.swift in Sources */,
 54.1178 -				37F615C92386B14A001AAE48 /* LoginScrollView.swift in Sources */,
 54.1179  				49C34AF620E4F649009D11CC /* CellDetailTransition.swift in Sources */,
 54.1180 +				5B394E1323ED5673006A1FC0 /* TrustManagementTableViewCell.swift in Sources */,
 54.1181  				49228A5520D4035100A51E9D /* DetailCellSegue.swift in Sources */,
 54.1182  				15D3D48B239FC14700F2EBFB /* EmailDetailCollectionViewCell.swift in Sources */,
 54.1183  				152A39E821905C3E00D9F8E4 /* RecipientCellViewModel.swift in Sources */,
 54.1184 +				5BC4E5FF240E99C2008C01ED /* CustomTraitCollectionViewController.swift in Sources */,
 54.1185  				152A39CE21905C3E00D9F8E4 /* ComposeHelpers.swift in Sources */,
 54.1186  				43985D0A2044296D0080FA9A /* OAuth2AuthViewModel.swift in Sources */,
 54.1187  				49691B1520D7FD0200CA9367 /* MessageViewModelConfigurable.swift in Sources */,
 54.1188 @@ -3082,6 +3189,7 @@
 54.1189  				37816542230EC72C00B967E3 /* PEPAlertViewController.swift in Sources */,
 54.1190  				00FD0CE62101F7D700BA0C56 /* ScreenComposerProtocol.swift in Sources */,
 54.1191  				3705096C22DC8C1800CB73D6 /* KeyInputView.swift in Sources */,
 54.1192 +				1512132424166A6E009B7C88 /* AccountSettingsTableViewController.swift in Sources */,
 54.1193  				4351C2D81F4441190053381F /* references.c in Sources */,
 54.1194  				152A39DC21905C3E00D9F8E4 /* TextViewContainingTableViewCell.swift in Sources */,
 54.1195  				000D3C2F20D12BFD006B11B2 /* MessageViewModel.swift in Sources */,
 54.1196 @@ -3096,11 +3204,13 @@
 54.1197  				B7DB7FD7221AD3BB003968DA /* UIButton+Extension.swift in Sources */,
 54.1198  				4351C2D91F4441190053381F /* render.c in Sources */,
 54.1199  				B722EC4D1E5B01B300A2B9D5 /* FolderCellViewModel.swift in Sources */,
 54.1200 -				15874BCF2127493E00A3A4A6 /* AccountSettingsTableViewController.swift in Sources */,
 54.1201  				B71EBBBC1E55E4AE00150177 /* FolderTableViewController.swift in Sources */,
 54.1202  				492EF92F20C699D0004EAE14 /* ThreadViewController+TableView.swift in Sources */,
 54.1203  				43D070312133DB920013B120 /* AppSettingsProtocol.swift in Sources */,
 54.1204 +				B7B0E8F324094BB1003A34DC /* SplitViewHandlingProtocol.swift in Sources */,
 54.1205  				43ED53781CC77F95006AB156 /* SMTPSettingsViewController.swift in Sources */,
 54.1206 +				3AC2B845240E692600E08EB3 /* ClientCertificatePasswordViewModel.swift in Sources */,
 54.1207 +				5BC14ABF23E2EE78005F0AF3 /* TrustManagementViewModel.swift in Sources */,
 54.1208  				15146C91237F07EF00D69495 /* PEPPageViewControllerBase.swift in Sources */,
 54.1209  			);
 54.1210  			runOnlyForDeploymentPostprocessing = 0;
 54.1211 @@ -3129,6 +3239,7 @@
 54.1212  				43C7B9D11CEC4DDF007A612F /* MiscTests.swift in Sources */,
 54.1213  				431C2B171F387C4100D87FFD /* LoginViewModelTests.swift in Sources */,
 54.1214  				151AD7AD219D74C700FC36FF /* ComposeViewModelTest.swift in Sources */,
 54.1215 +				3AC2B847241021C300E08EB3 /* ClientCertificatePasswordViewModelTest.swift in Sources */,
 54.1216  				00227E6A21635DED000D9BDB /* FilterViewModelTest.swift in Sources */,
 54.1217  				437795C82154D6FD00CC62C2 /* PEPMessage+TestExtension.swift in Sources */,
 54.1218  				151F71F7202A06760057C74D /* TestDataBase.swift in Sources */,
 54.1219 @@ -3152,7 +3263,6 @@
 54.1220  				15410D1D2199C2E500BBF65F /* SubjectCellViewModelTest.swift in Sources */,
 54.1221  				430BA229203438A3003B041C /* CdMessagePEPMessageTests.swift in Sources */,
 54.1222  				15410D1F2199CA1100BBF65F /* XCTTestCase+Utils.swift in Sources */,
 54.1223 -				431F987F1F6FD3E300A1E4D2 /* HandshakePartnerTableViewCellViewModelTests.swift in Sources */,
 54.1224  				43D3379021A3F32500E40114 /* ImapUtil.swift in Sources */,
 54.1225  				15D7D995219B2C5C00A1A2B9 /* ComposeViewModel+InitDataTest.swift in Sources */,
 54.1226  				1541D7F51FC82A4900D52A5D /* URL+MIME.swift in Sources */,
 54.1227 @@ -3180,7 +3290,9 @@
 54.1228  				15410D252199ECD700BBF65F /* AttachmentViewModelTest.swift in Sources */,
 54.1229  				43257C861F50659200DDC7F0 /* StringHTMLExtensionTests.swift in Sources */,
 54.1230  				43A0B2CF214006FC00FB779D /* ReplyUtilTests.swift in Sources */,
 54.1231 +				B78602B12412B6380027132B /* AccountTypeSelectorTest.swift in Sources */,
 54.1232  				375643502371BC4600FB354D /* EditableAccountSettingsTableViewModelTest.swift in Sources */,
 54.1233 +				5BC14AC923E47A55005F0AF3 /* TrustManagementViewModelTest.swift in Sources */,
 54.1234  			);
 54.1235  			runOnlyForDeploymentPostprocessing = 0;
 54.1236  		};
 54.1237 @@ -3219,26 +3331,26 @@
 54.1238  				151DE7DF1FC5D3E200CDC273 /* Base */,
 54.1239  				43C98AC0219C22E8006418B0 /* de */,
 54.1240  				4307D5DE23575853004569C4 /* en */,
 54.1241 +				15B75BE623FB026800DAE976 /* fr */,
 54.1242 +				15B75BF123FB027600DAE976 /* es */,
 54.1243 +				158A565724052280003C0D7E /* nl */,
 54.1244 +				158A566024052360003C0D7E /* ca */,
 54.1245 +				158A566B2405236F003C0D7E /* tr */,
 54.1246  			);
 54.1247  			name = Settings.storyboard;
 54.1248  			sourceTree = "<group>";
 54.1249  		};
 54.1250 -		151DE7E31FC5D3FA00CDC273 /* Handshake.storyboard */ = {
 54.1251 -			isa = PBXVariantGroup;
 54.1252 -			children = (
 54.1253 -				151DE7E21FC5D3FA00CDC273 /* Base */,
 54.1254 -				43C98AC8219C3691006418B0 /* de */,
 54.1255 -				4307D5E023575853004569C4 /* en */,
 54.1256 -			);
 54.1257 -			name = Handshake.storyboard;
 54.1258 -			sourceTree = "<group>";
 54.1259 -		};
 54.1260  		151DE7E61FC5D41600CDC273 /* FolderViews.storyboard */ = {
 54.1261  			isa = PBXVariantGroup;
 54.1262  			children = (
 54.1263  				151DE7E51FC5D41600CDC273 /* Base */,
 54.1264  				4372ECD5219C436D00F84099 /* de */,
 54.1265  				4307D5DB23575853004569C4 /* en */,
 54.1266 +				15B75BEA23FB026900DAE976 /* fr */,
 54.1267 +				15B75BF523FB027600DAE976 /* es */,
 54.1268 +				158A565B24052281003C0D7E /* nl */,
 54.1269 +				158A566424052360003C0D7E /* ca */,
 54.1270 +				158A566F2405236F003C0D7E /* tr */,
 54.1271  			);
 54.1272  			name = FolderViews.storyboard;
 54.1273  			sourceTree = "<group>";
 54.1274 @@ -3249,15 +3361,40 @@
 54.1275  				155F2D9F20530798001B4B1C /* Base */,
 54.1276  				4372ECD6219C436D00F84099 /* de */,
 54.1277  				4307D5DF23575853004569C4 /* en */,
 54.1278 +				15B75BEB23FB026900DAE976 /* fr */,
 54.1279 +				15B75BF623FB027600DAE976 /* es */,
 54.1280 +				158A565C24052281003C0D7E /* nl */,
 54.1281 +				158A566524052360003C0D7E /* ca */,
 54.1282 +				158A56702405236F003C0D7E /* tr */,
 54.1283  			);
 54.1284  			name = Reusable.storyboard;
 54.1285  			sourceTree = "<group>";
 54.1286  		};
 54.1287 +		3A2119E624125AC60030C3E4 /* Certificates.storyboard */ = {
 54.1288 +			isa = PBXVariantGroup;
 54.1289 +			children = (
 54.1290 +				3A2119E524125AC60030C3E4 /* Base */,
 54.1291 +				3A2119E824125ACE0030C3E4 /* en */,
 54.1292 +				3A2119EA24125ACF0030C3E4 /* ca */,
 54.1293 +				3A2119EC24125AD30030C3E4 /* nl */,
 54.1294 +				3A2119EE24125AD50030C3E4 /* fr */,
 54.1295 +				3A2119F024125AD60030C3E4 /* de */,
 54.1296 +				3A2119F224125AD70030C3E4 /* es */,
 54.1297 +				3A2119F424125AD80030C3E4 /* tr */,
 54.1298 +			);
 54.1299 +			name = Certificates.storyboard;
 54.1300 +			sourceTree = "<group>";
 54.1301 +		};
 54.1302  		4307D5D823575853004569C4 /* InfoPlist.strings */ = {
 54.1303  			isa = PBXVariantGroup;
 54.1304  			children = (
 54.1305  				4307D5D923575853004569C4 /* en */,
 54.1306  				43993C2F2357587700FE311E /* de */,
 54.1307 +				15B75BED23FB026B00DAE976 /* fr */,
 54.1308 +				15B75BF823FB027600DAE976 /* es */,
 54.1309 +				158A565324052280003C0D7E /* nl */,
 54.1310 +				158A566724052360003C0D7E /* ca */,
 54.1311 +				158A56722405236F003C0D7E /* tr */,
 54.1312  			);
 54.1313  			name = InfoPlist.strings;
 54.1314  			sourceTree = "<group>";
 54.1315 @@ -3266,6 +3403,13 @@
 54.1316  			isa = PBXVariantGroup;
 54.1317  			children = (
 54.1318  				433404CC2379789600E785F1 /* Base */,
 54.1319 +				15B75BE523FB026800DAE976 /* fr */,
 54.1320 +				15B75BF023FB027600DAE976 /* es */,
 54.1321 +				158A565624052280003C0D7E /* nl */,
 54.1322 +				158A565F24052360003C0D7E /* ca */,
 54.1323 +				158A566A2405236E003C0D7E /* tr */,
 54.1324 +				439817522418ECA700C8AB84 /* en */,
 54.1325 +				439817542418ECA800C8AB84 /* de */,
 54.1326  			);
 54.1327  			name = NothingSelected.storyboard;
 54.1328  			sourceTree = "<group>";
 54.1329 @@ -3276,6 +3420,11 @@
 54.1330  				43980E2B1CBD0BC900A7FC3C /* Base */,
 54.1331  				43C98AC4219C275E006418B0 /* de */,
 54.1332  				4307D5E223575853004569C4 /* en */,
 54.1333 +				15B75BE423FB026800DAE976 /* fr */,
 54.1334 +				15B75BEF23FB027600DAE976 /* es */,
 54.1335 +				158A565524052280003C0D7E /* nl */,
 54.1336 +				158A565E24052360003C0D7E /* ca */,
 54.1337 +				158A56692405236E003C0D7E /* tr */,
 54.1338  			);
 54.1339  			name = Main.storyboard;
 54.1340  			sourceTree = "<group>";
 54.1341 @@ -3284,15 +3433,57 @@
 54.1342  			isa = PBXVariantGroup;
 54.1343  			children = (
 54.1344  				43980E331CBD0BCA00A7FC3C /* Base */,
 54.1345 +				15B75BE923FB026900DAE976 /* fr */,
 54.1346 +				15B75BF423FB027600DAE976 /* es */,
 54.1347 +				158A565A24052281003C0D7E /* nl */,
 54.1348 +				158A566324052360003C0D7E /* ca */,
 54.1349 +				158A566E2405236F003C0D7E /* tr */,
 54.1350 +				439817562418ECC400C8AB84 /* de */,
 54.1351 +				439817582418ECC600C8AB84 /* en */,
 54.1352  			);
 54.1353  			name = LaunchScreen.storyboard;
 54.1354  			sourceTree = "<group>";
 54.1355  		};
 54.1356 +		4398175B2418ED2000C8AB84 /* TrustManagement.storyboard */ = {
 54.1357 +			isa = PBXVariantGroup;
 54.1358 +			children = (
 54.1359 +				4398175C2418ED2F00C8AB84 /* Base */,
 54.1360 +				4398175E2418ED3100C8AB84 /* ca */,
 54.1361 +				439817602418ED3500C8AB84 /* nl */,
 54.1362 +				439817622418ED3A00C8AB84 /* fr */,
 54.1363 +				439817642418ED3B00C8AB84 /* de */,
 54.1364 +				439817662418ED3F00C8AB84 /* es */,
 54.1365 +				439817682418ED4400C8AB84 /* tr */,
 54.1366 +				4398177A2418F06A00C8AB84 /* en */,
 54.1367 +			);
 54.1368 +			name = TrustManagement.storyboard;
 54.1369 +			sourceTree = "<group>";
 54.1370 +		};
 54.1371 +		4398176B2418EDB200C8AB84 /* Tutorial.storyboard */ = {
 54.1372 +			isa = PBXVariantGroup;
 54.1373 +			children = (
 54.1374 +				4398176C2418EDCC00C8AB84 /* Base */,
 54.1375 +				4398176E2418EDD000C8AB84 /* ca */,
 54.1376 +				439817702418EDD200C8AB84 /* nl */,
 54.1377 +				439817722418EDD500C8AB84 /* fr */,
 54.1378 +				439817742418EDD700C8AB84 /* de */,
 54.1379 +				439817762418EDD900C8AB84 /* es */,
 54.1380 +				439817782418EDDB00C8AB84 /* tr */,
 54.1381 +				439817792418F06000C8AB84 /* en */,
 54.1382 +			);
 54.1383 +			name = Tutorial.storyboard;
 54.1384 +			sourceTree = "<group>";
 54.1385 +		};
 54.1386  		43C98AC1219C275E006418B0 /* Localizable.strings */ = {
 54.1387  			isa = PBXVariantGroup;
 54.1388  			children = (
 54.1389  				43C98AC2219C275E006418B0 /* de */,
 54.1390  				4307D5DC23575853004569C4 /* en */,
 54.1391 +				15B75BEE23FB026B00DAE976 /* fr */,
 54.1392 +				15B75BF923FB027700DAE976 /* es */,
 54.1393 +				158A565424052280003C0D7E /* nl */,
 54.1394 +				158A566824052360003C0D7E /* ca */,
 54.1395 +				158A56732405236F003C0D7E /* tr */,
 54.1396  			);
 54.1397  			name = Localizable.strings;
 54.1398  			sourceTree = "<group>";
 54.1399 @@ -3303,6 +3494,11 @@
 54.1400  				491B656120CFE0FD00C2ADDA /* Base */,
 54.1401  				4372ECD7219C436D00F84099 /* de */,
 54.1402  				4307D5E123575853004569C4 /* en */,
 54.1403 +				15B75BEC23FB026900DAE976 /* fr */,
 54.1404 +				15B75BF723FB027600DAE976 /* es */,
 54.1405 +				158A565D24052281003C0D7E /* nl */,
 54.1406 +				158A566624052360003C0D7E /* ca */,
 54.1407 +				158A56712405236F003C0D7E /* tr */,
 54.1408  			);
 54.1409  			name = Thread.storyboard;
 54.1410  			sourceTree = "<group>";
 54.1411 @@ -3313,6 +3509,11 @@
 54.1412  				B78309C71EAA09040051A2E0 /* Base */,
 54.1413  				43C98ABF219C22E8006418B0 /* de */,
 54.1414  				4307D5DD23575853004569C4 /* en */,
 54.1415 +				15B75BE723FB026900DAE976 /* fr */,
 54.1416 +				15B75BF223FB027600DAE976 /* es */,
 54.1417 +				158A565824052280003C0D7E /* nl */,
 54.1418 +				158A566124052360003C0D7E /* ca */,
 54.1419 +				158A566C2405236F003C0D7E /* tr */,
 54.1420  			);
 54.1421  			name = AccountCreation.storyboard;
 54.1422  			sourceTree = "<group>";
 54.1423 @@ -3380,7 +3581,7 @@
 54.1424  					"$(SRCROOT)/../pEpEngine/src",
 54.1425  					"$(SRCROOT)/pEpForiOS/Markdown/include",
 54.1426  				);
 54.1427 -				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 54.1428 +				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 54.1429  				MTL_ENABLE_DEBUG_INFO = YES;
 54.1430  				ONLY_ACTIVE_ARCH = YES;
 54.1431  				OTHER_LDFLAGS = "-ObjC";
 54.1432 @@ -3447,7 +3648,7 @@
 54.1433  					"$(SRCROOT)/../pEpEngine/src",
 54.1434  					"$(SRCROOT)/pEpForiOS/Markdown/include",
 54.1435  				);
 54.1436 -				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 54.1437 +				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 54.1438  				MTL_ENABLE_DEBUG_INFO = NO;
 54.1439  				OTHER_LDFLAGS = "-ObjC";
 54.1440  				OTHER_SWIFT_FLAGS = "";
 54.1441 @@ -3484,7 +3685,7 @@
 54.1442  				INFOPLIST_FILE = pEpForiOS/Info.plist;
 54.1443  				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 54.1444  				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 54.1445 -				MARKETING_VERSION = 1.1;
 54.1446 +				MARKETING_VERSION = 1.0.916;
 54.1447  				ONLY_ACTIVE_ARCH = "$(inherited)";
 54.1448  				OTHER_SWIFT_FLAGS = "-DDEBUG_LOGGING -D DEBUG $(inherited)";
 54.1449  				PRODUCT_BUNDLE_IDENTIFIER = security.pEp;
 54.1450 @@ -3523,7 +3724,7 @@
 54.1451  				INFOPLIST_FILE = pEpForiOS/Info.plist;
 54.1452  				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 54.1453  				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 54.1454 -				MARKETING_VERSION = 1.1;
 54.1455 +				MARKETING_VERSION = 1.0.916;
 54.1456  				ONLY_ACTIVE_ARCH = "$(inherited)";
 54.1457  				PRODUCT_BUNDLE_IDENTIFIER = security.pEp;
 54.1458  				PRODUCT_MODULE_NAME = pEpForiOS;
    55.1 --- a/pEpForiOS.xcodeproj/xcshareddata/xcschemes/pEp.xcscheme	Tue Feb 18 18:23:43 2020 +0100
    55.2 +++ b/pEpForiOS.xcodeproj/xcshareddata/xcschemes/pEp.xcscheme	Thu Mar 12 09:49:46 2020 +0100
    55.3 @@ -14,10 +14,24 @@
    55.4              buildForAnalyzing = "YES">
    55.5              <BuildableReference
    55.6                 BuildableIdentifier = "primary"
    55.7 -               BlueprintIdentifier = "43980E221CBD0BC900A7FC3C"
    55.8 -               BuildableName = "pEp.app"
    55.9 -               BlueprintName = "pEp"
   55.10 -               ReferencedContainer = "container:pEpForiOS.xcodeproj">
   55.11 +               BlueprintIdentifier = "43FBB7621FC6D9630057A3BD"
   55.12 +               BuildableName = "ldns_xcode.framework"
   55.13 +               BlueprintName = "ldns-xcode"
   55.14 +               ReferencedContainer = "container:../ldns/xcode/ldns-xcode/ldns-xcode.xcodeproj">
   55.15 +            </BuildableReference>
   55.16 +         </BuildActionEntry>
   55.17 +         <BuildActionEntry
   55.18 +            buildForTesting = "YES"
   55.19 +            buildForRunning = "YES"
   55.20 +            buildForProfiling = "YES"
   55.21 +            buildForArchiving = "YES"
   55.22 +            buildForAnalyzing = "YES">
   55.23 +            <BuildableReference
   55.24 +               BuildableIdentifier = "primary"
   55.25 +               BlueprintIdentifier = "B7E0502C1EB2491E006EC1EC"
   55.26 +               BuildableName = "libAccountSettingsAdapter.a"
   55.27 +               BlueprintName = "AccountSettingsAdapter"
   55.28 +               ReferencedContainer = "container:../libAccountSettings/xcode/AccountSettingsAdapter/AccountSettingsAdapter.xcodeproj">
   55.29              </BuildableReference>
   55.30           </BuildActionEntry>
   55.31           <BuildActionEntry
   55.32 @@ -70,20 +84,6 @@
   55.33              buildForAnalyzing = "YES">
   55.34              <BuildableReference
   55.35                 BuildableIdentifier = "primary"
   55.36 -               BlueprintIdentifier = "43CB60811DA4EB4E0015281E"
   55.37 -               BuildableName = "MessageModel.framework"
   55.38 -               BlueprintName = "MessageModel"
   55.39 -               ReferencedContainer = "container:../MessageModel/MessageModel/MessageModel.xcodeproj">
   55.40 -            </BuildableReference>
   55.41 -         </BuildActionEntry>
   55.42 -         <BuildActionEntry
   55.43 -            buildForTesting = "YES"
   55.44 -            buildForRunning = "YES"
   55.45 -            buildForProfiling = "YES"
   55.46 -            buildForArchiving = "YES"
   55.47 -            buildForAnalyzing = "YES">
   55.48 -            <BuildableReference
   55.49 -               BuildableIdentifier = "primary"
   55.50                 BlueprintIdentifier = "B7911EB321F7358500D7F66F"
   55.51                 BuildableName = "pEpIOSToolbox.framework"
   55.52                 BlueprintName = "pEpIOSToolbox"
   55.53 @@ -98,20 +98,6 @@
   55.54              buildForAnalyzing = "YES">
   55.55              <BuildableReference
   55.56                 BuildableIdentifier = "primary"
   55.57 -               BlueprintIdentifier = "43FBB7621FC6D9630057A3BD"
   55.58 -               BuildableName = "ldns_xcode.framework"
   55.59 -               BlueprintName = "ldns-xcode"
   55.60 -               ReferencedContainer = "container:../ldns/xcode/ldns-xcode/ldns-xcode.xcodeproj">
   55.61 -            </BuildableReference>
   55.62 -         </BuildActionEntry>
   55.63 -         <BuildActionEntry
   55.64 -            buildForTesting = "YES"
   55.65 -            buildForRunning = "YES"
   55.66 -            buildForProfiling = "YES"
   55.67 -            buildForArchiving = "YES"
   55.68 -            buildForAnalyzing = "YES">
   55.69 -            <BuildableReference
   55.70 -               BuildableIdentifier = "primary"
   55.71                 BlueprintIdentifier = "4329CA572238FCBF007D377E"
   55.72                 BuildableName = "PantomimeFramework.framework"
   55.73                 BlueprintName = "PantomimeFramework"
   55.74 @@ -126,10 +112,24 @@
   55.75              buildForAnalyzing = "YES">
   55.76              <BuildableReference
   55.77                 BuildableIdentifier = "primary"
   55.78 -               BlueprintIdentifier = "B7E0502C1EB2491E006EC1EC"
   55.79 -               BuildableName = "libAccountSettingsAdapter.a"
   55.80 -               BlueprintName = "AccountSettingsAdapter"
   55.81 -               ReferencedContainer = "container:../libAccountSettings/xcode/AccountSettingsAdapter/AccountSettingsAdapter.xcodeproj">
   55.82 +               BlueprintIdentifier = "43CB60811DA4EB4E0015281E"
   55.83 +               BuildableName = "MessageModel.framework"
   55.84 +               BlueprintName = "MessageModel"
   55.85 +               ReferencedContainer = "container:../MessageModel/MessageModel/MessageModel.xcodeproj">
   55.86 +            </BuildableReference>
   55.87 +         </BuildActionEntry>
   55.88 +         <BuildActionEntry
   55.89 +            buildForTesting = "YES"
   55.90 +            buildForRunning = "YES"
   55.91 +            buildForProfiling = "YES"
   55.92 +            buildForArchiving = "YES"
   55.93 +            buildForAnalyzing = "YES">
   55.94 +            <BuildableReference
   55.95 +               BuildableIdentifier = "primary"
   55.96 +               BlueprintIdentifier = "43980E221CBD0BC900A7FC3C"
   55.97 +               BuildableName = "pEp.app"
   55.98 +               BlueprintName = "pEp"
   55.99 +               ReferencedContainer = "container:pEpForiOS.xcodeproj">
  55.100              </BuildableReference>
  55.101           </BuildActionEntry>
  55.102           <BuildActionEntry
    56.1 --- a/pEpForiOS/AppDelegate.swift	Tue Feb 18 18:23:43 2020 +0100
    56.2 +++ b/pEpForiOS/AppDelegate.swift	Thu Mar 12 09:49:46 2020 +0100
    56.3 @@ -16,23 +16,25 @@
    56.4  class AppDelegate: UIResponder, UIApplicationDelegate {
    56.5      var window: UIWindow?
    56.6  
    56.7 -    var appConfig: AppConfig?
    56.8 +    private var appConfig: AppConfig?
    56.9  
   56.10      /** The model */
   56.11 -    var messageModelService: MessageModelServiceProtocol?
   56.12 +    private var messageModelService: MessageModelServiceProtocol?
   56.13  
   56.14      /// Error Handler bubble errors up to the UI
   56.15 -    var errorPropagator = ErrorPropagator()
   56.16 -
   56.17 -    let mySelfQueue = LimitedOperationQueue()
   56.18 +    private var errorPropagator = ErrorPropagator()
   56.19  
   56.20      /// This is used to handle OAuth2 requests.
   56.21 -    let oauth2Provider = OAuth2ProviderFactory().oauth2Provider()
   56.22 +    private let oauth2Provider = OAuth2ProviderFactory().oauth2Provider()
   56.23  
   56.24 -    var syncUserActionsAndCleanupbackgroundTaskId = UIBackgroundTaskIdentifier.invalid
   56.25 +    private var syncUserActionsAndCleanupbackgroundTaskId = UIBackgroundTaskIdentifier.invalid
   56.26  
   56.27      /// Set to true whever the app goes into background, so the main PEPSession gets cleaned up.
   56.28 -    var shouldDestroySession = false
   56.29 +    private var shouldDestroySession = false
   56.30 +
   56.31 +    private lazy var clientCertificateUIUtil: ClientCertificateUIUtil = {
   56.32 +        return ClientCertificateUIUtil()
   56.33 +    }()
   56.34  
   56.35      private func setupInitialViewController() -> Bool {
   56.36          guard let appConfig = appConfig else {
   56.37 @@ -56,7 +58,7 @@
   56.38          return true
   56.39      }
   56.40  
   56.41 -    func cleanupPEPSessionIfNeeded() {
   56.42 +    private func cleanupPEPSessionIfNeeded() {
   56.43          if shouldDestroySession {
   56.44              PEPSession.cleanup()
   56.45          }
   56.46 @@ -82,7 +84,18 @@
   56.47          UserNotificationTool.askForPermissions()
   56.48      }
   56.49  
   56.50 -    // MARK: - UIApplicationDelegate
   56.51 +    // MARK: - HELPER
   56.52 +
   56.53 +    private func cleanup(andCall completionHandler:(UIBackgroundFetchResult) -> Void,
   56.54 +                                result:UIBackgroundFetchResult) {
   56.55 +        PEPSession.cleanup()
   56.56 +        completionHandler(result)
   56.57 +    }
   56.58 +}
   56.59 +
   56.60 +// MARK: - UIApplicationDelegate
   56.61 +
   56.62 +extension AppDelegate {
   56.63  
   56.64      func applicationDidReceiveMemoryWarning(_ application: UIApplication) {
   56.65          Log.shared.errorAndCrash("applicationDidReceiveMemoryWarning")
   56.66 @@ -97,14 +110,15 @@
   56.67          }
   56.68  
   56.69          application.setMinimumBackgroundFetchInterval(60.0 * 10)
   56.70 +        Appearance.pEp()
   56.71 +        setupServices()
   56.72 +        askUserForNotificationPermissions()
   56.73 +        var result = setupInitialViewController()
   56.74  
   56.75 -        Appearance.pEp()
   56.76 -
   56.77 -        setupServices()
   56.78 -
   56.79 -        askUserForNotificationPermissions()
   56.80 -
   56.81 -        let result = setupInitialViewController()
   56.82 +        if let openedToOpenFile = launchOptions?[UIApplication.LaunchOptionsKey.url] as? URL {
   56.83 +            // We have been opened by the OS to handle a certain file.
   56.84 +             result = handleUrlTheOSHasBroughtUsToForgroundFor(openedToOpenFile)
   56.85 +        }
   56.86  
   56.87          return result
   56.88      }
   56.89 @@ -169,7 +183,7 @@
   56.90  
   56.91      func application(_ application: UIApplication, performFetchWithCompletionHandler
   56.92          completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
   56.93 -        
   56.94 +
   56.95          guard let messageModelService = messageModelService else {
   56.96              Log.shared.error("no networkService")
   56.97              return
   56.98 @@ -191,11 +205,10 @@
   56.99          }
  56.100      }
  56.101  
  56.102 -    func application(_ app: UIApplication, open url: URL,
  56.103 +    func application(_ app: UIApplication,
  56.104 +                     open url: URL,
  56.105                       options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
  56.106 -        // Unclear if this is needed, presumabley doesn't get invoked for OAuth2 because
  56.107 -        // SFSafariViewController is involved there.
  56.108 -        return oauth2Provider.processAuthorizationRedirect(url: url)
  56.109 +         return handleUrlTheOSHasBroughtUsToForgroundFor(url)
  56.110      }
  56.111  
  56.112      func application(_ application: UIApplication, continue userActivity: NSUserActivity,
  56.113 @@ -206,14 +219,6 @@
  56.114          }
  56.115          return false
  56.116      }
  56.117 -
  56.118 -    // MARK: - HELPER
  56.119 -
  56.120 -    private func cleanup(andCall completionHandler:(UIBackgroundFetchResult) -> Void,
  56.121 -                                result:UIBackgroundFetchResult) {
  56.122 -        PEPSession.cleanup()
  56.123 -        completionHandler(result)
  56.124 -    }
  56.125  }
  56.126  
  56.127  // MARK: - User Notifiation
  56.128 @@ -226,3 +231,34 @@
  56.129          }
  56.130      }
  56.131  }
  56.132 +
  56.133 +// MARK: - Client Certificate Import
  56.134 +
  56.135 +extension AppDelegate {
  56.136 +
  56.137 +    @discardableResult
  56.138 +    private func handleUrlTheOSHasBroughtUsToForgroundFor(_ url: URL) -> Bool {
  56.139 +        switch url.pathExtension {
  56.140 +        case ClientCertificateUIUtil.pEpClientCertificateExtension:
  56.141 +            return handleClientCertificateImport(forCertAt: url)
  56.142 +        default:
  56.143 +            Log.shared.errorAndCrash("Unexpected call. open for file with extention: %@",
  56.144 +                                     url.pathExtension)
  56.145 +        }
  56.146 +        return false
  56.147 +    }
  56.148 +
  56.149 +    private func handleClientCertificateImport(forCertAt url: URL) -> Bool {
  56.150 +        guard url.pathExtension == ClientCertificateUIUtil.pEpClientCertificateExtension else {
  56.151 +            Log.shared.errorAndCrash("This method is only for .pEp12 files.")
  56.152 +            return false
  56.153 +        }
  56.154 +        guard let topVC = UIApplication.topViewController() else {
  56.155 +            Log.shared.errorAndCrash("We must have a VC at this point.")
  56.156 +            return false
  56.157 +        }
  56.158 +        clientCertificateUIUtil.importClientCertificate(at: url,
  56.159 +                                                        viewControllerToPresentUiOn: topVC)
  56.160 +        return true
  56.161 +    }
  56.162 +}
    57.1 --- a/pEpForiOS/AppSettings/AppSettings.swift	Tue Feb 18 18:23:43 2020 +0100
    57.2 +++ b/pEpForiOS/AppSettings/AppSettings.swift	Thu Mar 12 09:49:46 2020 +0100
    57.3 @@ -1,5 +1,5 @@
    57.4  //
    57.5 -//  DefaultAppSettings.swift
    57.6 +//  AppSettings.swift
    57.7  //  pEp
    57.8  //
    57.9  //  Created by Dirk Zimmermann on 27.08.18.
    58.1 --- a/pEpForiOS/Base.lproj/AccountCreation.storyboard	Tue Feb 18 18:23:43 2020 +0100
    58.2 +++ b/pEpForiOS/Base.lproj/AccountCreation.storyboard	Thu Mar 12 09:49:46 2020 +0100
    58.3 @@ -1,10 +1,11 @@
    58.4  <?xml version="1.0" encoding="UTF-8"?>
    58.5  <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="n6h-PU-h88">
    58.6 -    <device id="retina6_1" orientation="portrait" appearance="light"/>
    58.7 +    <device id="ipad11_0rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
    58.8      <dependencies>
    58.9          <deployment identifier="iOS"/>
   58.10          <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
   58.11          <capability name="Safe area layout guides" minToolsVersion="9.0"/>
   58.12 +        <capability name="collection view cell content view" minToolsVersion="11.0"/>
   58.13          <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
   58.14      </dependencies>
   58.15      <scenes>
   58.16 @@ -31,20 +32,20 @@
   58.17              <objects>
   58.18                  <viewController modalPresentationStyle="fullScreen" id="clh-8B-z2B" customClass="LoginViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   58.19                      <view key="view" contentMode="scaleToFill" id="7n3-u6-UKe">
   58.20 -                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
   58.21 +                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
   58.22                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   58.23                          <subviews>
   58.24                              <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="qYA-qu-vFE" userLabel="BackgroungImage">
   58.25 -                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
   58.26 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
   58.27                              </imageView>
   58.28 -                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RXQ-HQ-bsM" customClass="LoginScrollView" customModule="pEpForiOS" customModuleProvider="target">
   58.29 -                                <rect key="frame" x="0.0" y="44" width="414" height="818"/>
   58.30 +                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RXQ-HQ-bsM" customClass="DynamicHeightScrollView" customModule="pEpForiOS" customModuleProvider="target">
   58.31 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1174"/>
   58.32                                  <subviews>
   58.33                                      <view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4O-yC-tc7">
   58.34 -                                        <rect key="frame" x="0.0" y="0.0" width="414" height="818"/>
   58.35 +                                        <rect key="frame" x="0.0" y="0.0" width="834" height="1174"/>
   58.36                                          <subviews>
   58.37                                              <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="73" translatesAutoresizingMaskIntoConstraints="NO" id="8nk-hU-BvN">
   58.38 -                                                <rect key="frame" x="57" y="282" width="300" height="254"/>
   58.39 +                                                <rect key="frame" x="267" y="460" width="300" height="254"/>
   58.40                                                  <subviews>
   58.41                                                      <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" borderStyle="line" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Nx2-xq-Km8" customClass="AnimatedPlaceholderTextfield" customModule="pEpForiOS" customModuleProvider="target">
   58.42                                                          <rect key="frame" x="0.0" y="0.0" width="300" height="36"/>
   58.43 @@ -138,7 +139,7 @@
   58.44                                                  </constraints>
   58.45                                              </stackView>
   58.46                                              <view contentMode="scaleToFill" horizontalCompressionResistancePriority="700" verticalCompressionResistancePriority="700" translatesAutoresizingMaskIntoConstraints="NO" id="gsz-7C-yke" userLabel="Buttons View">
   58.47 -                                                <rect key="frame" x="57" y="571" width="300" height="125"/>
   58.48 +                                                <rect key="frame" x="267" y="749" width="300" height="125"/>
   58.49                                                  <subviews>
   58.50                                                      <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i7a-Xk-Hbw">
   58.51                                                          <rect key="frame" x="124" y="0.0" width="52" height="33"/>
   58.52 @@ -279,7 +280,7 @@
   58.53                                                  </variation>
   58.54                                              </view>
   58.55                                              <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sub-2j-OvV" userLabel="Cancel Button">
   58.56 -                                                <rect key="frame" x="151" y="495.5" width="53" height="33"/>
   58.57 +                                                <rect key="frame" x="184" y="570.5" width="53" height="33"/>
   58.58                                                  <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   58.59                                                  <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   58.60                                                  <inset key="imageEdgeInsets" minX="12" minY="12" maxX="12" maxY="12"/>
   58.61 @@ -289,7 +290,7 @@
   58.62                                                  </connections>
   58.63                                              </button>
   58.64                                              <button hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wIi-CI-cLC">
   58.65 -                                                <rect key="frame" x="572" y="495.5" width="52" height="33"/>
   58.66 +                                                <rect key="frame" x="605" y="570.5" width="52" height="33"/>
   58.67                                                  <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   58.68                                                  <state key="normal" title="Sign In">
   58.69                                                      <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   58.70 @@ -320,12 +321,12 @@
   58.71                                                  <exclude reference="wIi-CI-cLC"/>
   58.72                                              </mask>
   58.73                                              <mask key="constraints">
   58.74 -                                                <exclude reference="GmD-Wm-JOd"/>
   58.75 -                                                <exclude reference="yhd-W2-zSi"/>
   58.76                                                  <exclude reference="7aS-8l-hE8"/>
   58.77                                                  <exclude reference="EfY-cM-oX6"/>
   58.78                                                  <exclude reference="Ibq-10-F28"/>
   58.79                                                  <exclude reference="nuG-ed-xFj"/>
   58.80 +                                                <exclude reference="GmD-Wm-JOd"/>
   58.81 +                                                <exclude reference="yhd-W2-zSi"/>
   58.82                                              </mask>
   58.83                                          </variation>
   58.84                                          <variation key="heightClass=compact">
   58.85 @@ -339,10 +340,10 @@
   58.86                                          </variation>
   58.87                                          <variation key="heightClass=regular">
   58.88                                              <mask key="constraints">
   58.89 +                                                <include reference="7aS-8l-hE8"/>
   58.90 +                                                <include reference="EfY-cM-oX6"/>
   58.91                                                  <include reference="GmD-Wm-JOd"/>
   58.92                                                  <include reference="yhd-W2-zSi"/>
   58.93 -                                                <include reference="7aS-8l-hE8"/>
   58.94 -                                                <include reference="EfY-cM-oX6"/>
   58.95                                              </mask>
   58.96                                          </variation>
   58.97                                          <variation key="heightClass=regular-widthClass=regular">
   58.98 @@ -426,34 +427,36 @@
   58.99          <!--Navigation Controller-->
  58.100          <scene sceneID="aJL-6s-3px">
  58.101              <objects>
  58.102 -                <navigationController automaticallyAdjustsScrollViewInsets="NO" modalPresentationStyle="fullScreen" navigationBarHidden="YES" id="n6h-PU-h88" sceneMemberID="viewController">
  58.103 +                <navigationController automaticallyAdjustsScrollViewInsets="NO" modalPresentationStyle="fullScreen" id="n6h-PU-h88" sceneMemberID="viewController">
  58.104                      <toolbarItems/>
  58.105                      <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="xOX-61-BbZ">
  58.106 +                        <rect key="frame" x="0.0" y="0.0" width="834" height="50"/>
  58.107                          <autoresizingMask key="autoresizingMask"/>
  58.108                          <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.109 +                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.110                      </navigationBar>
  58.111                      <nil name="viewControllers"/>
  58.112                      <connections>
  58.113 -                        <segue destination="clh-8B-z2B" kind="relationship" relationship="rootViewController" id="oJy-Qa-jKN"/>
  58.114 +                        <segue destination="L5l-QH-yd0" kind="relationship" relationship="rootViewController" id="Xbl-mP-hLW"/>
  58.115                      </connections>
  58.116                  </navigationController>
  58.117                  <placeholder placeholderIdentifier="IBFirstResponder" id="D07-Xf-86Q" userLabel="First Responder" sceneMemberID="firstResponder"/>
  58.118              </objects>
  58.119 -            <point key="canvasLocation" x="5647" y="-396"/>
  58.120 +            <point key="canvasLocation" x="4626" y="-398"/>
  58.121          </scene>
  58.122          <!--User Info View Controller-->
  58.123          <scene sceneID="j9A-ew-A6L">
  58.124              <objects>
  58.125                  <viewController id="QAU-aE-DUt" customClass="UserInfoViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  58.126                      <view key="view" contentMode="scaleToFill" id="GwJ-zY-bOh">
  58.127 -                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
  58.128 +                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.129                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  58.130                          <subviews>
  58.131                              <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="hbd-aB-0Fo" userLabel="BackgroungImage">
  58.132 -                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
  58.133 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.134                              </imageView>
  58.135                              <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f11-Xi-yU2" customClass="ManualAccountSetupContainerView" customModule="pEpForiOS" customModuleProvider="target">
  58.136 -                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
  58.137 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.138                              </view>
  58.139                          </subviews>
  58.140                          <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  58.141 @@ -493,14 +496,14 @@
  58.142              <objects>
  58.143                  <viewController id="7Js-Hk-oVa" userLabel="IMAPSettingsViewController" customClass="IMAPSettingsViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  58.144                      <view key="view" contentMode="scaleToFill" id="MSx-zK-MfE">
  58.145 -                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
  58.146 +                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.147                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  58.148                          <subviews>
  58.149                              <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="FkF-pn-Lc4" userLabel="BackgroungImage">
  58.150 -                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
  58.151 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.152                              </imageView>
  58.153                              <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n9J-Ja-jGn" customClass="ManualAccountSetupContainerView" customModule="pEpForiOS" customModuleProvider="target">
  58.154 -                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
  58.155 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.156                              </view>
  58.157                          </subviews>
  58.158                          <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  58.159 @@ -540,14 +543,14 @@
  58.160              <objects>
  58.161                  <viewController id="nT4-iY-7y4" userLabel="SMTPSettingsViewController" customClass="SMTPSettingsViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  58.162                      <view key="view" contentMode="scaleToFill" id="2Us-kU-M1a">
  58.163 -                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
  58.164 +                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.165                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  58.166                          <subviews>
  58.167                              <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="dIf-r3-w2y" userLabel="BackgroungImage">
  58.168 -                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
  58.169 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.170                              </imageView>
  58.171                              <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g44-1J-8hx" customClass="ManualAccountSetupContainerView" customModule="pEpForiOS" customModuleProvider="target">
  58.172 -                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
  58.173 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.174                              </view>
  58.175                          </subviews>
  58.176                          <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  58.177 @@ -583,8 +586,281 @@
  58.178              </objects>
  58.179              <point key="canvasLocation" x="9513" y="-396"/>
  58.180          </scene>
  58.181 +        <!--Client Certificate Management View Controller-->
  58.182 +        <scene sceneID="KfB-P8-qVQ">
  58.183 +            <objects>
  58.184 +                <viewController storyboardIdentifier="ClientCertificateManagementViewController" id="Qyj-kG-7VF" customClass="ClientCertificateManagementViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  58.185 +                    <view key="view" contentMode="scaleToFill" id="NT5-R2-fiW">
  58.186 +                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.187 +                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  58.188 +                        <subviews>
  58.189 +                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="z5N-Cp-fBY">
  58.190 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.191 +                            </imageView>
  58.192 +                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YyD-mC-c9i">
  58.193 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="123"/>
  58.194 +                                <subviews>
  58.195 +                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select Certificate" textAlignment="natural" lineBreakMode="characterWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fd1-jY-GRg">
  58.196 +                                        <rect key="frame" x="313.5" y="32" width="207.5" height="33.5"/>
  58.197 +                                        <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
  58.198 +                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.199 +                                        <nil key="highlightedColor"/>
  58.200 +                                    </label>
  58.201 +                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please select which certificate you would like to use:" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="piS-rX-R34">
  58.202 +                                        <rect key="frame" x="217" y="90.5" width="400.5" height="20.5"/>
  58.203 +                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  58.204 +                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.205 +                                        <nil key="highlightedColor"/>
  58.206 +                                    </label>
  58.207 +                                </subviews>
  58.208 +                                <constraints>
  58.209 +                                    <constraint firstItem="piS-rX-R34" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="YyD-mC-c9i" secondAttribute="leading" constant="40" id="G0k-Qv-ZPC"/>
  58.210 +                                    <constraint firstItem="piS-rX-R34" firstAttribute="top" secondItem="Fd1-jY-GRg" secondAttribute="bottom" constant="25" id="GIB-TE-fiA"/>
  58.211 +                                    <constraint firstItem="Fd1-jY-GRg" firstAttribute="centerX" secondItem="YyD-mC-c9i" secondAttribute="centerX" id="JnY-3G-J03"/>
  58.212 +                                    <constraint firstAttribute="bottom" secondItem="piS-rX-R34" secondAttribute="bottom" constant="12" id="NwY-7m-oOX"/>
  58.213 +                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="piS-rX-R34" secondAttribute="trailing" constant="40" id="TEN-l0-lXA"/>
  58.214 +                                    <constraint firstItem="Fd1-jY-GRg" firstAttribute="top" secondItem="YyD-mC-c9i" secondAttribute="top" constant="32" id="oSp-SO-e8r"/>
  58.215 +                                    <constraint firstItem="piS-rX-R34" firstAttribute="centerX" secondItem="YyD-mC-c9i" secondAttribute="centerX" id="qQ6-ub-xbm"/>
  58.216 +                                </constraints>
  58.217 +                            </view>
  58.218 +                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ztt-aa-W7u">
  58.219 +                                <rect key="frame" x="0.0" y="131" width="834" height="1043"/>
  58.220 +                                <subviews>
  58.221 +                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="AZr-4K-O4u">
  58.222 +                                        <rect key="frame" x="167" y="20" width="500" height="1003"/>
  58.223 +                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.224 +                                        <constraints>
  58.225 +                                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="NBq-lE-8mP"/>
  58.226 +                                        </constraints>
  58.227 +                                        <prototypes>
  58.228 +                                            <tableViewCell opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ClientCertificateManagementTableViewCell" id="Pn0-2A-DOv" customClass="ClientCertificateManagementTableViewCell" customModule="pEpForiOS" customModuleProvider="target">
  58.229 +                                                <rect key="frame" x="0.0" y="28" width="500" height="115"/>
  58.230 +                                                <autoresizingMask key="autoresizingMask"/>
  58.231 +                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Pn0-2A-DOv" id="D7m-vG-HQd">
  58.232 +                                                    <rect key="frame" x="0.0" y="0.0" width="500" height="115"/>
  58.233 +                                                    <autoresizingMask key="autoresizingMask"/>
  58.234 +                                                    <subviews>
  58.235 +                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qZt-wf-aTO">
  58.236 +                                                            <rect key="frame" x="20" y="20" width="460" height="75"/>
  58.237 +                                                            <subviews>
  58.238 +                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bMB-bi-vvg">
  58.239 +                                                                    <rect key="frame" x="10" y="15" width="52.5" height="26.5"/>
  58.240 +                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
  58.241 +                                                                    <color key="textColor" red="0.0064750583839999999" green="0.7039813399" blue="0.30714368819999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  58.242 +                                                                    <nil key="highlightedColor"/>
  58.243 +                                                                </label>
  58.244 +                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cy2-FQ-sUK">
  58.245 +                                                                    <rect key="frame" x="10" y="43.5" width="33" height="16"/>
  58.246 +                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
  58.247 +                                                                    <color key="textColor" red="0.0064750583839999999" green="0.7039813399" blue="0.30714368819999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  58.248 +                                                                    <nil key="highlightedColor"/>
  58.249 +                                                                </label>
  58.250 +                                                            </subviews>
  58.251 +                                                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  58.252 +                                                            <constraints>
  58.253 +                                                                <constraint firstItem="Cy2-FQ-sUK" firstAttribute="top" secondItem="bMB-bi-vvg" secondAttribute="bottom" constant="2" id="2mj-b7-YLC"/>
  58.254 +                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Cy2-FQ-sUK" secondAttribute="trailing" constant="10" id="J58-gn-biL"/>
  58.255 +                                                                <constraint firstItem="bMB-bi-vvg" firstAttribute="top" secondItem="qZt-wf-aTO" secondAttribute="top" constant="15" id="K7s-Ml-EZ6"/>
  58.256 +                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="bMB-bi-vvg" secondAttribute="trailing" constant="10" id="R25-H3-11f"/>
  58.257 +                                                                <constraint firstItem="bMB-bi-vvg" firstAttribute="leading" secondItem="qZt-wf-aTO" secondAttribute="leading" constant="10" id="UDg-ch-UMQ"/>
  58.258 +                                                                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="Cy2-FQ-sUK" secondAttribute="bottom" constant="15" id="cxp-31-IsE"/>
  58.259 +                                                                <constraint firstItem="Cy2-FQ-sUK" firstAttribute="leading" secondItem="qZt-wf-aTO" secondAttribute="leading" constant="10" id="dL3-9R-X0E"/>
  58.260 +                                                            </constraints>
  58.261 +                                                        </view>
  58.262 +                                                    </subviews>
  58.263 +                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.264 +                                                    <constraints>
  58.265 +                                                        <constraint firstAttribute="trailing" secondItem="qZt-wf-aTO" secondAttribute="trailing" constant="20" symbolic="YES" id="9Ib-RI-rS9"/>
  58.266 +                                                        <constraint firstItem="qZt-wf-aTO" firstAttribute="leading" secondItem="D7m-vG-HQd" secondAttribute="leading" constant="20" symbolic="YES" id="Wwn-c8-J6A"/>
  58.267 +                                                        <constraint firstItem="qZt-wf-aTO" firstAttribute="centerY" secondItem="D7m-vG-HQd" secondAttribute="centerY" id="YqH-P9-2I2"/>
  58.268 +                                                        <constraint firstItem="qZt-wf-aTO" firstAttribute="top" secondItem="D7m-vG-HQd" secondAttribute="top" constant="20" symbolic="YES" id="op4-Ke-aEH"/>
  58.269 +                                                    </constraints>
  58.270 +                                                </tableViewCellContentView>
  58.271 +                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.272 +                                                <connections>
  58.273 +                                                    <outlet property="dateLabel" destination="Cy2-FQ-sUK" id="g77-nv-wG1"/>
  58.274 +                                                    <outlet property="titleLabel" destination="bMB-bi-vvg" id="m7U-S2-39v"/>
  58.275 +                                                </connections>
  58.276 +                                            </tableViewCell>
  58.277 +                                        </prototypes>
  58.278 +                                    </tableView>
  58.279 +                                </subviews>
  58.280 +                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.281 +                                <constraints>
  58.282 +                                    <constraint firstItem="AZr-4K-O4u" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Ztt-aa-W7u" secondAttribute="leading" constant="16" id="19F-rt-Jli"/>
  58.283 +                                    <constraint firstAttribute="bottom" secondItem="AZr-4K-O4u" secondAttribute="bottom" priority="750" constant="20" symbolic="YES" id="3Ph-0C-LeS"/>
  58.284 +                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="AZr-4K-O4u" secondAttribute="trailing" constant="16" id="3Qp-4F-xcF"/>
  58.285 +                                    <constraint firstItem="AZr-4K-O4u" firstAttribute="top" secondItem="Ztt-aa-W7u" secondAttribute="top" constant="20" symbolic="YES" id="50s-kh-WR3"/>
  58.286 +                                    <constraint firstItem="AZr-4K-O4u" firstAttribute="centerX" secondItem="Ztt-aa-W7u" secondAttribute="centerX" id="HQB-up-Xj7"/>
  58.287 +                                    <constraint firstAttribute="trailing" secondItem="AZr-4K-O4u" secondAttribute="trailing" priority="750" constant="16" id="aBQ-ft-r9s"/>
  58.288 +                                    <constraint firstItem="AZr-4K-O4u" firstAttribute="leading" secondItem="Ztt-aa-W7u" secondAttribute="leading" priority="750" constant="16" id="oau-Tp-snw"/>
  58.289 +                                    <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="AZr-4K-O4u" secondAttribute="bottom" id="vhM-3r-RTl"/>
  58.290 +                                </constraints>
  58.291 +                            </view>
  58.292 +                        </subviews>
  58.293 +                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.294 +                        <constraints>
  58.295 +                            <constraint firstItem="YyD-mC-c9i" firstAttribute="leading" secondItem="whS-bT-40C" secondAttribute="leading" id="9mC-ml-Hgo"/>
  58.296 +                            <constraint firstItem="whS-bT-40C" firstAttribute="trailing" secondItem="Ztt-aa-W7u" secondAttribute="trailing" id="AXo-We-jtf"/>
  58.297 +                            <constraint firstItem="Ztt-aa-W7u" firstAttribute="top" secondItem="YyD-mC-c9i" secondAttribute="bottom" constant="8" symbolic="YES" id="Ctc-Cu-wiO"/>
  58.298 +                            <constraint firstAttribute="bottom" secondItem="z5N-Cp-fBY" secondAttribute="bottom" id="SJa-j4-LJ5"/>
  58.299 +                            <constraint firstItem="z5N-Cp-fBY" firstAttribute="top" secondItem="NT5-R2-fiW" secondAttribute="top" id="bFY-Bg-BzW"/>
  58.300 +                            <constraint firstItem="whS-bT-40C" firstAttribute="trailing" secondItem="YyD-mC-c9i" secondAttribute="trailing" id="m9J-KK-bb6"/>
  58.301 +                            <constraint firstItem="whS-bT-40C" firstAttribute="bottom" secondItem="Ztt-aa-W7u" secondAttribute="bottom" id="mWi-qq-bpI"/>
  58.302 +                            <constraint firstItem="Ztt-aa-W7u" firstAttribute="leading" secondItem="whS-bT-40C" secondAttribute="leading" id="n9P-pO-EQx"/>
  58.303 +                            <constraint firstAttribute="trailing" secondItem="z5N-Cp-fBY" secondAttribute="trailing" id="nCN-vg-pbV"/>
  58.304 +                            <constraint firstItem="z5N-Cp-fBY" firstAttribute="leading" secondItem="NT5-R2-fiW" secondAttribute="leading" id="ph5-iF-gef"/>
  58.305 +                            <constraint firstItem="YyD-mC-c9i" firstAttribute="top" secondItem="whS-bT-40C" secondAttribute="top" id="rFf-WP-fq5"/>
  58.306 +                        </constraints>
  58.307 +                        <viewLayoutGuide key="safeArea" id="whS-bT-40C"/>
  58.308 +                    </view>
  58.309 +                    <navigationItem key="navigationItem" id="TGi-N8-gcY"/>
  58.310 +                    <connections>
  58.311 +                        <outlet property="tableView" destination="AZr-4K-O4u" id="EB0-Ub-7b0"/>
  58.312 +                        <segue destination="clh-8B-z2B" kind="show" identifier="showLogin" id="Eaq-Ij-JdY"/>
  58.313 +                    </connections>
  58.314 +                </viewController>
  58.315 +                <placeholder placeholderIdentifier="IBFirstResponder" id="axc-fA-bI1" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  58.316 +            </objects>
  58.317 +            <point key="canvasLocation" x="5586.9565217391309" y="379.6875"/>
  58.318 +        </scene>
  58.319 +        <!--Account Type Selector View Controller-->
  58.320 +        <scene sceneID="V9w-WW-Gu0">
  58.321 +            <objects>
  58.322 +                <viewController id="L5l-QH-yd0" customClass="AccountTypeSelectorViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  58.323 +                    <view key="view" contentMode="scaleToFill" id="vCs-pa-EKN">
  58.324 +                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.325 +                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  58.326 +                        <subviews>
  58.327 +                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="Qvj-Kg-e68">
  58.328 +                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
  58.329 +                            </imageView>
  58.330 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Welcome to p≡p" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YOK-e7-Ke7">
  58.331 +                                <rect key="frame" x="295" y="28" width="244" height="41"/>
  58.332 +                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
  58.333 +                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.334 +                                <nil key="highlightedColor"/>
  58.335 +                            </label>
  58.336 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please select the type of account you would like to set up with p≡p" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fLS-EM-fbk">
  58.337 +                                <rect key="frame" x="292" y="99" width="250" height="40.5"/>
  58.338 +                                <constraints>
  58.339 +                                    <constraint firstAttribute="width" constant="250" id="U4P-VQ-aoz">
  58.340 +                                        <variation key="heightClass=compact-widthClass=compact" constant="500"/>
  58.341 +                                    </constraint>
  58.342 +                                </constraints>
  58.343 +                                <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
  58.344 +                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.345 +                                <nil key="highlightedColor"/>
  58.346 +                            </label>
  58.347 +                            <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="qSY-an-Kw8">
  58.348 +                                <rect key="frame" x="117" y="179.5" width="600" height="954.5"/>
  58.349 +                                <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.350 +                                <constraints>
  58.351 +                                    <constraint firstAttribute="width" constant="250" id="922-Vk-wOa">
  58.352 +                                        <variation key="heightClass=compact-widthClass=compact" constant="450"/>
  58.353 +                                        <variation key="heightClass=compact-widthClass=regular" constant="600"/>
  58.354 +                                        <variation key="heightClass=regular-widthClass=regular" constant="600"/>
  58.355 +                                    </constraint>
  58.356 +                                </constraints>
  58.357 +                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="r3c-yT-fzZ">
  58.358 +                                    <size key="itemSize" width="50" height="50"/>
  58.359 +                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
  58.360 +                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
  58.361 +                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
  58.362 +                                </collectionViewFlowLayout>
  58.363 +                                <cells>
  58.364 +                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="providerImageCell" id="sx3-ns-V2S" customClass="AccountTypeSelectorImageCollectionViewCell" customModule="pEpForiOS" customModuleProvider="target">
  58.365 +                                        <rect key="frame" x="0.0" y="0.0" width="120" height="60"/>
  58.366 +                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  58.367 +                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="0be-Mw-TSY">
  58.368 +                                            <rect key="frame" x="0.0" y="0.0" width="120" height="60"/>
  58.369 +                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  58.370 +                                            <subviews>
  58.371 +                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="asset-Google" translatesAutoresizingMaskIntoConstraints="NO" id="cbt-3L-94D">
  58.372 +                                                    <rect key="frame" x="10" y="10" width="100" height="40"/>
  58.373 +                                                </imageView>
  58.374 +                                            </subviews>
  58.375 +                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.376 +                                            <constraints>
  58.377 +                                                <constraint firstAttribute="trailing" secondItem="cbt-3L-94D" secondAttribute="trailing" constant="10" id="Kpw-bf-cNw"/>
  58.378 +                                                <constraint firstAttribute="bottom" secondItem="cbt-3L-94D" secondAttribute="bottom" constant="10" id="NkH-CF-R7I"/>
  58.379 +                                                <constraint firstItem="cbt-3L-94D" firstAttribute="top" secondItem="0be-Mw-TSY" secondAttribute="top" constant="10" id="OwH-ZZ-3OV"/>
  58.380 +                                                <constraint firstItem="cbt-3L-94D" firstAttribute="centerX" secondItem="0be-Mw-TSY" secondAttribute="centerX" id="WLK-h7-eXz"/>
  58.381 +                                                <constraint firstItem="cbt-3L-94D" firstAttribute="leading" secondItem="0be-Mw-TSY" secondAttribute="leading" constant="10" id="ZdS-q4-cRR"/>
  58.382 +                                                <constraint firstItem="cbt-3L-94D" firstAttribute="centerY" secondItem="0be-Mw-TSY" secondAttribute="centerY" id="iCx-qf-mGd"/>
  58.383 +                                            </constraints>
  58.384 +                                        </collectionViewCellContentView>
  58.385 +                                        <size key="customSize" width="120" height="60"/>
  58.386 +                                        <connections>
  58.387 +                                            <outlet property="imageToFill" destination="cbt-3L-94D" id="yJ7-2M-Qsv"/>
  58.388 +                                        </connections>
  58.389 +                                    </collectionViewCell>
  58.390 +                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="providerTextCell" id="lfg-xG-5Nq" customClass="AccountTypeSelectorTextCollectionViewCell" customModule="pEpForiOS" customModuleProvider="target">
  58.391 +                                        <rect key="frame" x="160" y="0.0" width="120" height="60"/>
  58.392 +                                        <autoresizingMask key="autoresizingMask"/>
  58.393 +                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="yl0-ar-AwL">
  58.394 +                                            <rect key="frame" x="0.0" y="0.0" width="120" height="60"/>
  58.395 +                                            <autoresizingMask key="autoresizingMask"/>
  58.396 +                                            <subviews>
  58.397 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jp7-tC-8UK">
  58.398 +                                                    <rect key="frame" x="10" y="10" width="100" height="40"/>
  58.399 +                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  58.400 +                                                    <nil key="textColor"/>
  58.401 +                                                    <nil key="highlightedColor"/>
  58.402 +                                                </label>
  58.403 +                                            </subviews>
  58.404 +                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  58.405 +                                            <constraints>
  58.406 +                                                <constraint firstAttribute="bottom" secondItem="jp7-tC-8UK" secondAttribute="bottom" constant="10" id="HaN-Lq-HL6"/>
  58.407 +                                                <constraint firstItem="jp7-tC-8UK" firstAttribute="top" secondItem="yl0-ar-AwL" secondAttribute="top" constant="10" id="OZH-MP-u25"/>
  58.408 +                                                <constraint firstAttribute="trailing" secondItem="jp7-tC-8UK" secondAttribute="trailing" constant="10" id="Rss-Bk-LcM"/>
  58.409 +                                                <constraint firstItem="jp7-tC-8UK" firstAttribute="leading" secondItem="yl0-ar-AwL" secondAttribute="leading" constant="10" id="Tbf-Jz-Ip7"/>
  58.410 +                                            </constraints>
  58.411 +                                        </collectionViewCellContentView>
  58.412 +                                        <size key="customSize" width="120" height="60"/>
  58.413 +                                        <connections>
  58.414 +                                            <outlet property="textToFill" destination="jp7-tC-8UK" id="cSM-Oi-img"/>
  58.415 +                                        </connections>
  58.416 +                                    </collectionViewCell>
  58.417 +                                </cells>
  58.418 +                            </collectionView>
  58.419 +                        </subviews>
  58.420 +                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  58.421 +                        <constraints>
  58.422 +                            <constraint firstItem="qSY-an-Kw8" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="4SX-0s-gq3" secondAttribute="leading" constant="5" id="1Xm-ta-HF3"/>
  58.423 +                            <constraint firstAttribute="bottom" secondItem="Qvj-Kg-e68" secondAttribute="bottom" id="Dza-IP-yGG"/>
  58.424 +                            <constraint firstItem="Qvj-Kg-e68" firstAttribute="leading" secondItem="vCs-pa-EKN" secondAttribute="leading" id="Kdx-W7-Dfx"/>
  58.425 +                            <constraint firstItem="YOK-e7-Ke7" firstAttribute="centerX" secondItem="vCs-pa-EKN" secondAttribute="centerX" id="Vco-8i-FcX"/>
  58.426 +                            <constraint firstItem="qSY-an-Kw8" firstAttribute="centerX" secondItem="vCs-pa-EKN" secondAttribute="centerX" id="Z76-U1-jr2"/>
  58.427 +                            <constraint firstItem="4SX-0s-gq3" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="qSY-an-Kw8" secondAttribute="trailing" constant="5" id="bkW-Yy-fDm"/>
  58.428 +                            <constraint firstItem="qSY-an-Kw8" firstAttribute="top" secondItem="fLS-EM-fbk" secondAttribute="bottom" constant="40" id="ceM-nr-qWS"/>
  58.429 +                            <constraint firstItem="4SX-0s-gq3" firstAttribute="bottom" secondItem="qSY-an-Kw8" secondAttribute="bottom" constant="40" id="nge-dY-DKp"/>
  58.430 +                            <constraint firstItem="Qvj-Kg-e68" firstAttribute="top" secondItem="vCs-pa-EKN" secondAttribute="top" id="pVV-sD-NCc"/>
  58.431 +                            <constraint firstItem="YOK-e7-Ke7" firstAttribute="top" secondItem="4SX-0s-gq3" secondAttribute="top" constant="28" id="qJg-4z-rpE"/>
  58.432 +                            <constraint firstItem="fLS-EM-fbk" firstAttribute="top" secondItem="YOK-e7-Ke7" secondAttribute="bottom" constant="30" id="s3O-uh-Rhh"/>
  58.433 +                            <constraint firstItem="Qvj-Kg-e68" firstAttribute="trailing" secondItem="vCs-pa-EKN" secondAttribute="trailing" id="x7u-wD-nFa"/>
  58.434 +                            <constraint firstItem="fLS-EM-fbk" firstAttribute="centerX" secondItem="vCs-pa-EKN" secondAttribute="centerX" id="yvS-mc-uSj"/>
  58.435 +                        </constraints>
  58.436 +                        <viewLayoutGuide key="safeArea" id="4SX-0s-gq3"/>
  58.437 +                    </view>
  58.438 +                    <navigationItem key="navigationItem" id="Fvo-rK-Wij"/>
  58.439 +                    <nil key="simulatedTopBarMetrics"/>
  58.440 +                    <connections>
  58.441 +                        <outlet property="collectionView" destination="qSY-an-Kw8" id="fT9-bD-ta5"/>
  58.442 +                        <segue destination="clh-8B-z2B" kind="show" identifier="showLogin" id="A6U-Bz-3KU"/>
  58.443 +                        <segue destination="Qyj-kG-7VF" kind="show" identifier="clientCertManagementSegue" id="efU-cA-Rt3"/>
  58.444 +                    </connections>
  58.445 +                </viewController>
  58.446 +                <placeholder placeholderIdentifier="IBFirstResponder" id="LTH-0U-dto" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  58.447 +            </objects>
  58.448 +            <point key="canvasLocation" x="5586.330935251799" y="-395.47738693467335"/>
  58.449 +        </scene>
  58.450      </scenes>
  58.451      <resources>
  58.452 +        <image name="asset-Google" width="101" height="33"/>
  58.453          <image name="splashscreen" width="228" height="404"/>
  58.454      </resources>
  58.455 +    <inferredMetricsTieBreakers>
  58.456 +        <segue reference="A6U-Bz-3KU"/>
  58.457 +    </inferredMetricsTieBreakers>
  58.458  </document>
    59.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    59.2 +++ b/pEpForiOS/Base.lproj/Certificates.storyboard	Thu Mar 12 09:49:46 2020 +0100
    59.3 @@ -0,0 +1,171 @@
    59.4 +<?xml version="1.0" encoding="UTF-8"?>
    59.5 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="boI-fd-aGT">
    59.6 +    <device id="retina4_0" orientation="portrait" appearance="light"/>
    59.7 +    <dependencies>
    59.8 +        <deployment identifier="iOS"/>
    59.9 +        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
   59.10 +        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
   59.11 +        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
   59.12 +    </dependencies>
   59.13 +    <scenes>
   59.14 +        <!--Client Certificate-->
   59.15 +        <scene sceneID="43U-HT-5ye">
   59.16 +            <objects>
   59.17 +                <viewController storyboardIdentifier="ClientCertificatePasswordViewController" title="Client Certificate" useStoryboardIdentifierAsRestorationIdentifier="YES" id="boI-fd-aGT" customClass="ClientCertificatePasswordViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   59.18 +                    <view key="view" contentMode="scaleToFill" id="ajb-yG-1c9">
   59.19 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   59.20 +                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   59.21 +                        <subviews>
   59.22 +                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="hwX-rN-uqq" userLabel="BackgroungImage">
   59.23 +                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   59.24 +                            </imageView>
   59.25 +                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6s5-cf-MJA" customClass="DynamicHeightScrollView" customModule="pEpForiOS" customModuleProvider="target">
   59.26 +                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   59.27 +                                <subviews>
   59.28 +                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="smi-RN-oWS">
   59.29 +                                        <rect key="frame" x="0.0" y="20" width="320" height="354"/>
   59.30 +                                        <subviews>
   59.31 +                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HU3-Zl-1aC">
   59.32 +                                                <rect key="frame" x="40.5" y="20" width="238.5" height="160"/>
   59.33 +                                                <subviews>
   59.34 +                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Client Certificate" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pbs-UB-tuc">
   59.35 +                                                        <rect key="frame" x="8" y="16" width="222.5" height="31.5"/>
   59.36 +                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
   59.37 +                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   59.38 +                                                        <nil key="highlightedColor"/>
   59.39 +                                                    </label>
   59.40 +                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please enter the password of the certificate to import it:" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BA2-UM-djD">
   59.41 +                                                        <rect key="frame" x="16" y="79.5" width="206.5" height="64.5"/>
   59.42 +                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   59.43 +                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   59.44 +                                                        <nil key="highlightedColor"/>
   59.45 +                                                    </label>
   59.46 +                                                </subviews>
   59.47 +                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   59.48 +                                                <constraints>
   59.49 +                                                    <constraint firstAttribute="bottom" secondItem="BA2-UM-djD" secondAttribute="bottom" constant="16" id="4TH-va-gPw"/>
   59.50 +                                                    <constraint firstAttribute="trailing" secondItem="BA2-UM-djD" secondAttribute="trailing" constant="16" id="EmV-dS-7XE"/>
   59.51 +                                                    <constraint firstItem="Pbs-UB-tuc" firstAttribute="leading" secondItem="HU3-Zl-1aC" secondAttribute="leading" constant="8" id="G7P-Nk-RQt"/>
   59.52 +                                                    <constraint firstItem="BA2-UM-djD" firstAttribute="top" relation="greaterThanOrEqual" secondItem="Pbs-UB-tuc" secondAttribute="bottom" constant="24" id="LZe-P2-4Ho"/>
   59.53 +                                                    <constraint firstItem="BA2-UM-djD" firstAttribute="leading" secondItem="HU3-Zl-1aC" secondAttribute="leading" constant="16" id="Nwd-iU-ZQk"/>
   59.54 +                                                    <constraint firstItem="Pbs-UB-tuc" firstAttribute="top" secondItem="HU3-Zl-1aC" secondAttribute="top" constant="16" id="Pyd-1G-L5p"/>
   59.55 +                                                    <constraint firstItem="BA2-UM-djD" firstAttribute="top" secondItem="Pbs-UB-tuc" secondAttribute="bottom" priority="250" constant="32" id="Q3B-Cb-3kE"/>
   59.56 +                                                    <constraint firstAttribute="width" relation="lessThanOrEqual" constant="380" id="a2b-pM-L27"/>
   59.57 +                                                    <constraint firstAttribute="trailing" secondItem="Pbs-UB-tuc" secondAttribute="trailing" constant="8" id="aGx-8c-iew"/>
   59.58 +                                                </constraints>
   59.59 +                                            </view>
   59.60 +                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z4V-po-NIJ">
   59.61 +                                                <rect key="frame" x="24.5" y="200" width="270.5" height="134"/>
   59.62 +                                                <subviews>
   59.63 +                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G8X-CZ-ulG">
   59.64 +                                                        <rect key="frame" x="16" y="40" width="238.5" height="16"/>
   59.65 +                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
   59.66 +                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   59.67 +                                                        <nil key="highlightedColor"/>
   59.68 +                                                    </label>
   59.69 +                                                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="r7z-Kb-BGL">
   59.70 +                                                        <rect key="frame" x="16" y="58" width="238.5" height="46"/>
   59.71 +                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   59.72 +                                                        <color key="tintColor" red="0.0064750583839999999" green="0.7039813399" blue="0.30714368819999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
   59.73 +                                                        <constraints>
   59.74 +                                                            <constraint firstAttribute="height" constant="46" id="qHL-6p-cup"/>
   59.75 +                                                        </constraints>
   59.76 +                                                        <color key="textColor" red="0.0064750583839999999" green="0.7039813399" blue="0.30714368819999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
   59.77 +                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
   59.78 +                                                        <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES" textContentType="password"/>
   59.79 +                                                    </textField>
   59.80 +                                                </subviews>
   59.81 +                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   59.82 +                                                <constraints>
   59.83 +                                                    <constraint firstAttribute="height" constant="134" id="4y9-Zb-Gv5"/>
   59.84 +                                                    <constraint firstAttribute="trailing" secondItem="r7z-Kb-BGL" secondAttribute="trailing" constant="16" id="6X2-iB-NFm"/>
   59.85 +                                                    <constraint firstItem="r7z-Kb-BGL" firstAttribute="top" secondItem="G8X-CZ-ulG" secondAttribute="bottom" constant="2" id="C7p-1b-AtG"/>
   59.86 +                                                    <constraint firstAttribute="bottom" secondItem="r7z-Kb-BGL" secondAttribute="bottom" constant="30" id="CFJ-hL-nfW"/>
   59.87 +                                                    <constraint firstItem="G8X-CZ-ulG" firstAttribute="leading" secondItem="Z4V-po-NIJ" secondAttribute="leading" constant="16" id="DGV-Mx-cje"/>
   59.88 +                                                    <constraint firstAttribute="trailing" secondItem="G8X-CZ-ulG" secondAttribute="trailing" constant="16" id="Ixl-jx-xTo"/>
   59.89 +                                                    <constraint firstItem="r7z-Kb-BGL" firstAttribute="leading" secondItem="Z4V-po-NIJ" secondAttribute="leading" constant="16" id="cBQ-KH-nMn"/>
   59.90 +                                                    <constraint firstItem="r7z-Kb-BGL" firstAttribute="top" secondItem="G8X-CZ-ulG" secondAttribute="bottom" constant="2" id="jOK-XR-eOL"/>
   59.91 +                                                </constraints>
   59.92 +                                            </view>
   59.93 +                                        </subviews>
   59.94 +                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   59.95 +                                        <constraints>
   59.96 +                                            <constraint firstItem="HU3-Zl-1aC" firstAttribute="top" secondItem="smi-RN-oWS" secondAttribute="top" constant="20" id="6Jh-uT-Nht"/>
   59.97 +                                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Z4V-po-NIJ" secondAttribute="trailing" constant="20" id="CHz-3x-x9w"/>
   59.98 +                                            <constraint firstItem="Z4V-po-NIJ" firstAttribute="centerX" secondItem="smi-RN-oWS" secondAttribute="centerX" id="Dbs-NI-BGS"/>
   59.99 +                                            <constraint firstItem="HU3-Zl-1aC" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="smi-RN-oWS" secondAttribute="leading" constant="20" id="SHn-f5-otF"/>
  59.100 +                                            <constraint firstItem="HU3-Zl-1aC" firstAttribute="centerX" secondItem="smi-RN-oWS" secondAttribute="centerX" id="UUD-M0-zrG"/>
  59.101 +                                            <constraint firstItem="Z4V-po-NIJ" firstAttribute="top" secondItem="HU3-Zl-1aC" secondAttribute="bottom" constant="20" id="eVE-4T-1mb"/>
  59.102 +                                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="HU3-Zl-1aC" secondAttribute="trailing" constant="20" id="gGV-Ag-jF2"/>
  59.103 +                                            <constraint firstItem="Z4V-po-NIJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="smi-RN-oWS" secondAttribute="leading" constant="20" id="h33-HP-1NJ"/>
  59.104 +                                            <constraint firstAttribute="bottom" secondItem="Z4V-po-NIJ" secondAttribute="bottom" constant="20" id="hDD-Hj-y4I"/>
  59.105 +                                            <constraint firstItem="r7z-Kb-BGL" firstAttribute="width" secondItem="HU3-Zl-1aC" secondAttribute="width" id="qbQ-sw-hvJ"/>
  59.106 +                                        </constraints>
  59.107 +                                    </view>
  59.108 +                                </subviews>
  59.109 +                                <constraints>
  59.110 +                                    <constraint firstItem="smi-RN-oWS" firstAttribute="top" secondItem="6s5-cf-MJA" secondAttribute="top" constant="20" symbolic="YES" id="AN6-k1-nAn"/>
  59.111 +                                    <constraint firstItem="Yp2-HU-tlW" firstAttribute="trailing" secondItem="smi-RN-oWS" secondAttribute="trailing" id="Cqp-cB-I4w"/>
  59.112 +                                    <constraint firstAttribute="trailing" secondItem="smi-RN-oWS" secondAttribute="trailing" constant="20" symbolic="YES" id="OsM-36-Ds4"/>
  59.113 +                                    <constraint firstItem="smi-RN-oWS" firstAttribute="width" secondItem="6s5-cf-MJA" secondAttribute="width" id="VKR-C8-3dz"/>
  59.114 +                                    <constraint firstAttribute="bottom" secondItem="smi-RN-oWS" secondAttribute="bottom" constant="20" id="o7N-hx-Jur"/>
  59.115 +                                    <constraint firstItem="smi-RN-oWS" firstAttribute="top" secondItem="6s5-cf-MJA" secondAttribute="top" constant="20" symbolic="YES" id="seC-nX-ecq"/>
  59.116 +                                </constraints>
  59.117 +                                <viewLayoutGuide key="contentLayoutGuide" id="6jI-eP-Cm4"/>
  59.118 +                                <viewLayoutGuide key="frameLayoutGuide" id="Yp2-HU-tlW"/>
  59.119 +                            </scrollView>
  59.120 +                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yyB-Tl-NaX">
  59.121 +                                <rect key="frame" x="30" y="520" width="67" height="39"/>
  59.122 +                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  59.123 +                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
  59.124 +                                <state key="normal" title="Cancel">
  59.125 +                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  59.126 +                                </state>
  59.127 +                                <connections>
  59.128 +                                    <action selector="cancelAction:" destination="boI-fd-aGT" eventType="touchUpInside" id="uVZ-aV-h7g"/>
  59.129 +                                </connections>
  59.130 +                            </button>
  59.131 +                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="foX-Ql-WX3">
  59.132 +                                <rect key="frame" x="270" y="520" width="31" height="39"/>
  59.133 +                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  59.134 +                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
  59.135 +                                <state key="normal" title="OK">
  59.136 +                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  59.137 +                                </state>
  59.138 +                                <connections>
  59.139 +                                    <action selector="okAction:" destination="boI-fd-aGT" eventType="touchUpInside" id="Pyq-E6-67i"/>
  59.140 +                                </connections>
  59.141 +                            </button>
  59.142 +                        </subviews>
  59.143 +                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  59.144 +                        <constraints>
  59.145 +                            <constraint firstItem="6s5-cf-MJA" firstAttribute="top" secondItem="OmB-JR-0Xd" secondAttribute="top" id="7Hy-v4-Csx"/>
  59.146 +                            <constraint firstItem="6s5-cf-MJA" firstAttribute="leading" secondItem="OmB-JR-0Xd" secondAttribute="leading" id="D9l-Fg-fpf"/>
  59.147 +                            <constraint firstItem="hwX-rN-uqq" firstAttribute="top" secondItem="ajb-yG-1c9" secondAttribute="top" id="FSJ-N9-uqf"/>
  59.148 +                            <constraint firstAttribute="bottom" secondItem="hwX-rN-uqq" secondAttribute="bottom" id="Ig4-kz-yV9"/>
  59.149 +                            <constraint firstItem="6s5-cf-MJA" firstAttribute="bottom" secondItem="OmB-JR-0Xd" secondAttribute="bottom" id="Mpv-zX-fBB"/>
  59.150 +                            <constraint firstItem="OmB-JR-0Xd" firstAttribute="trailing" secondItem="6s5-cf-MJA" secondAttribute="trailing" id="O1I-Wj-x6S"/>
  59.151 +                            <constraint firstAttribute="trailing" secondItem="hwX-rN-uqq" secondAttribute="trailing" id="WkN-z6-E4q"/>
  59.152 +                            <constraint firstItem="hwX-rN-uqq" firstAttribute="leading" secondItem="ajb-yG-1c9" secondAttribute="leading" id="ckI-yc-1et"/>
  59.153 +                        </constraints>
  59.154 +                        <viewLayoutGuide key="safeArea" id="OmB-JR-0Xd"/>
  59.155 +                    </view>
  59.156 +                    <navigationItem key="navigationItem" id="bsB-sN-mmG"/>
  59.157 +                    <connections>
  59.158 +                        <outlet property="cancelButton" destination="yyB-Tl-NaX" id="ASj-tj-AZE"/>
  59.159 +                        <outlet property="okButton" destination="foX-Ql-WX3" id="D6Z-ei-YLM"/>
  59.160 +                        <outlet property="passwordLabel" destination="G8X-CZ-ulG" id="v2Q-MC-Swv"/>
  59.161 +                        <outlet property="passwordTextField" destination="r7z-Kb-BGL" id="7Vl-yC-0YP"/>
  59.162 +                        <outlet property="scrollView" destination="6s5-cf-MJA" id="43z-PH-S0P"/>
  59.163 +                        <outlet property="scrollViewBottomConstraint" destination="Mpv-zX-fBB" id="UCS-5i-AS7"/>
  59.164 +                    </connections>
  59.165 +                </viewController>
  59.166 +                <placeholder placeholderIdentifier="IBFirstResponder" id="6Yr-Le-eH9" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  59.167 +            </objects>
  59.168 +            <point key="canvasLocation" x="131.25" y="65.217391304347828"/>
  59.169 +        </scene>
  59.170 +    </scenes>
  59.171 +    <resources>
  59.172 +        <image name="splashscreen" width="228" height="404"/>
  59.173 +    </resources>
  59.174 +</document>
    60.1 --- a/pEpForiOS/Base.lproj/FolderViews.storyboard	Tue Feb 18 18:23:43 2020 +0100
    60.2 +++ b/pEpForiOS/Base.lproj/FolderViews.storyboard	Thu Mar 12 09:49:46 2020 +0100
    60.3 @@ -1,9 +1,9 @@
    60.4  <?xml version="1.0" encoding="UTF-8"?>
    60.5 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="N0y-5z-66z">
    60.6 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="N0y-5z-66z">
    60.7      <device id="retina4_7" orientation="portrait" appearance="light"/>
    60.8      <dependencies>
    60.9          <deployment identifier="iOS"/>
   60.10 -        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
   60.11 +        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
   60.12          <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
   60.13      </dependencies>
   60.14      <scenes>
   60.15 @@ -63,13 +63,12 @@
   60.16                      <navigationItem key="navigationItem" id="rcC-dN-oTh"/>
   60.17                      <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
   60.18                      <connections>
   60.19 -                        <segue destination="uKb-Ku-Cng" kind="presentation" identifier="newAccountIphone" id="W2T-ax-nDz"/>
   60.20 -                        <segue destination="uKb-Ku-Cng" kind="presentation" identifier="newAccountIpad" id="VWu-Lk-rKj"/>
   60.21 +                        <segue destination="uKb-Ku-Cng" kind="presentation" identifier="newAccount" id="kBC-vv-Cfe"/>
   60.22                      </connections>
   60.23                  </tableViewController>
   60.24                  <placeholder placeholderIdentifier="IBFirstResponder" id="o2c-UY-yR4" userLabel="First Responder" sceneMemberID="firstResponder"/>
   60.25              </objects>
   60.26 -            <point key="canvasLocation" x="9884" y="-1164.4677661169417"/>
   60.27 +            <point key="canvasLocation" x="9916" y="-1164"/>
   60.28          </scene>
   60.29          <!--AccountCreation-->
   60.30          <scene sceneID="rdR-gU-SsC">
   60.31 @@ -79,7 +78,7 @@
   60.32                  </viewControllerPlaceholder>
   60.33                  <placeholder placeholderIdentifier="IBFirstResponder" id="7bq-Lz-J44" userLabel="First Responder" sceneMemberID="firstResponder"/>
   60.34              </objects>
   60.35 -            <point key="canvasLocation" x="10635" y="-1077"/>
   60.36 +            <point key="canvasLocation" x="10718" y="-1165"/>
   60.37          </scene>
   60.38          <!--NothingSelected-->
   60.39          <scene sceneID="eeX-Fr-Vs1">
   60.40 @@ -89,7 +88,7 @@
   60.41                  </viewControllerPlaceholder>
   60.42                  <placeholder placeholderIdentifier="IBFirstResponder" id="nrT-r1-KyC" userLabel="First Responder" sceneMemberID="firstResponder"/>
   60.43              </objects>
   60.44 -            <point key="canvasLocation" x="10091" y="-423"/>
   60.45 +            <point key="canvasLocation" x="9926" y="-75"/>
   60.46          </scene>
   60.47          <!--Navigation Controller-->
   60.48          <scene sceneID="7fi-4c-XJX">
   60.49 @@ -107,24 +106,39 @@
   60.50              </objects>
   60.51              <point key="canvasLocation" x="9094" y="-1164"/>
   60.52          </scene>
   60.53 -        <!--Primary Split View Controller-->
   60.54 +        <!--Split View Controller-->
   60.55          <scene sceneID="cmc-6v-uzh">
   60.56              <objects>
   60.57 -                <splitViewController storyboardIdentifier="main.initial.nvc" maximumPrimaryColumnWidth="320" id="N0y-5z-66z" customClass="PrimarySplitViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   60.58 +                <splitViewController storyboardIdentifier="main.initial.nvc" maximumPrimaryColumnWidth="320" id="N0y-5z-66z" customClass="PEPSplitViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   60.59                      <connections>
   60.60                          <segue destination="vQa-F1-CvY" kind="relationship" relationship="masterViewController" id="LaJ-Ow-wD4"/>
   60.61 -                        <segue destination="jlA-KV-xmZ" kind="relationship" relationship="detailViewController" id="b81-as-g9K"/>
   60.62 +                        <segue destination="TAp-yg-jwP" kind="relationship" relationship="detailViewController" id="b81-as-g9K"/>
   60.63                      </connections>
   60.64                  </splitViewController>
   60.65                  <placeholder placeholderIdentifier="IBFirstResponder" id="d4z-SE-fTT" userLabel="First Responder" sceneMemberID="firstResponder"/>
   60.66              </objects>
   60.67 -            <point key="canvasLocation" x="8334" y="-418"/>
   60.68 +            <point key="canvasLocation" x="8305" y="-417"/>
   60.69 +        </scene>
   60.70 +        <!--Navigation Controller-->
   60.71 +        <scene sceneID="kBD-Qq-HNw">
   60.72 +            <objects>
   60.73 +                <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="TAp-yg-jwP" sceneMemberID="viewController">
   60.74 +                    <toolbarItems/>
   60.75 +                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="pqy-qU-v21">
   60.76 +                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   60.77 +                        <autoresizingMask key="autoresizingMask"/>
   60.78 +                    </navigationBar>
   60.79 +                    <nil name="viewControllers"/>
   60.80 +                    <connections>
   60.81 +                        <segue destination="jlA-KV-xmZ" kind="relationship" relationship="rootViewController" id="7kR-kn-Fon"/>
   60.82 +                    </connections>
   60.83 +                </navigationController>
   60.84 +                <placeholder placeholderIdentifier="IBFirstResponder" id="i6z-0t-IdA" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
   60.85 +            </objects>
   60.86 +            <point key="canvasLocation" x="9094" y="-74"/>
   60.87          </scene>
   60.88      </scenes>
   60.89      <resources>
   60.90          <image name="button-add" width="22" height="22"/>
   60.91      </resources>
   60.92 -    <inferredMetricsTieBreakers>
   60.93 -        <segue reference="W2T-ax-nDz"/>
   60.94 -    </inferredMetricsTieBreakers>
   60.95  </document>
    61.1 --- a/pEpForiOS/Base.lproj/Handshake.storyboard	Tue Feb 18 18:23:43 2020 +0100
    61.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    61.3 @@ -1,276 +0,0 @@
    61.4 -<?xml version="1.0" encoding="UTF-8"?>
    61.5 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PZt-VJ-X5t">
    61.6 -    <device id="ipad9_7" orientation="landscape">
    61.7 -        <adaptation id="fullscreen"/>
    61.8 -    </device>
    61.9 -    <dependencies>
   61.10 -        <deployment identifier="iOS"/>
   61.11 -        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
   61.12 -        <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
   61.13 -        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
   61.14 -    </dependencies>
   61.15 -    <scenes>
   61.16 -        <!--Handshake View Controller-->
   61.17 -        <scene sceneID="IVD-QH-CTl">
   61.18 -            <objects>
   61.19 -                <tableViewController storyboardIdentifier="HandshakeViewControllerID" id="Jbh-LP-Jl1" customClass="HandshakeViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   61.20 -                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="307" sectionHeaderHeight="28" sectionFooterHeight="28" id="oZy-Mt-k2w" userLabel="HandshakeTableView">
   61.21 -                        <rect key="frame" x="0.0" y="0.0" width="1024" height="698"/>
   61.22 -                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   61.23 -                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
   61.24 -                        <prototypes>
   61.25 -                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="handshakePartnerCell" rowHeight="350" id="amH-Dy-6D1" userLabel="HandshakePartnerCell" customClass="HandshakePartnerTableViewCell" customModule="pEpForiOS" customModuleProvider="target">
   61.26 -                                <rect key="frame" x="0.0" y="28" width="1024" height="350"/>
   61.27 -                                <autoresizingMask key="autoresizingMask"/>
   61.28 -                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="amH-Dy-6D1" id="sNy-KY-p78" userLabel="HandshakeContentView">
   61.29 -                                    <rect key="frame" x="0.0" y="0.0" width="1024" height="350"/>
   61.30 -                                    <autoresizingMask key="autoresizingMask"/>
   61.31 -                                    <subviews>
   61.32 -                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="1sS-UJ-WGa" userLabel="OuterStackView">
   61.33 -                                            <rect key="frame" x="350" y="20" width="324.5" height="310"/>
   61.34 -                                            <subviews>
   61.35 -                                                <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="Hwo-n8-tYE" userLabel="HeaderStackView">
   61.36 -                                                    <rect key="frame" x="0.0" y="0.0" width="324.5" height="48"/>
   61.37 -                                                    <subviews>
   61.38 -                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SFH-dH-XjY" userLabel="PartnerTokenView">
   61.39 -                                                            <rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
   61.40 -                                                            <subviews>
   61.41 -                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="empty-avatar" translatesAutoresizingMaskIntoConstraints="NO" id="rG1-9L-QdA" userLabel="PartnerImage">
   61.42 -                                                                    <rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
   61.43 -                                                                    <accessibility key="accessibilityConfiguration" identifier="partnerImageView"/>
   61.44 -                                                                </imageView>
   61.45 -                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hZH-e1-puE">
   61.46 -                                                                    <rect key="frame" x="32" y="32" width="20" height="20"/>
   61.47 -                                                                    <accessibility key="accessibilityConfiguration" identifier="pEpStatusImageView"/>
   61.48 -                                                                    <constraints>
   61.49 -                                                                        <constraint firstAttribute="width" secondItem="hZH-e1-puE" secondAttribute="height" multiplier="1:1" id="And-L7-gTh"/>
   61.50 -                                                                        <constraint firstAttribute="width" constant="20" id="GNL-nL-hic"/>
   61.51 -                                                                    </constraints>
   61.52 -                                                                </imageView>
   61.53 -                                                            </subviews>
   61.54 -                                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
   61.55 -                                                            <constraints>
   61.56 -                                                                <constraint firstItem="rG1-9L-QdA" firstAttribute="top" secondItem="SFH-dH-XjY" secondAttribute="top" id="H8t-IG-t8x"/>
   61.57 -                                                                <constraint firstAttribute="width" secondItem="SFH-dH-XjY" secondAttribute="height" multiplier="1:1" id="IKs-R6-4ca"/>
   61.58 -                                                                <constraint firstItem="rG1-9L-QdA" firstAttribute="width" secondItem="SFH-dH-XjY" secondAttribute="width" id="KPA-o5-y53"/>
   61.59 -                                                                <constraint firstItem="rG1-9L-QdA" firstAttribute="height" secondItem="SFH-dH-XjY" secondAttribute="height" id="cOE-W5-pie"/>
   61.60 -                                                                <constraint firstAttribute="bottom" secondItem="hZH-e1-puE" secondAttribute="bottom" constant="-4" id="do2-MY-H0j"/>
   61.61 -                                                                <constraint firstAttribute="trailing" secondItem="hZH-e1-puE" secondAttribute="trailing" constant="-4" id="jF0-Ie-G4Z"/>
   61.62 -                                                                <constraint firstItem="rG1-9L-QdA" firstAttribute="leading" secondItem="SFH-dH-XjY" secondAttribute="leading" id="keh-aa-d4N"/>
   61.63 -                                                            </constraints>
   61.64 -                                                        </view>
   61.65 -                                                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacingType="standard" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vj3-9e-bA1" userLabel="MiddleStackView">
   61.66 -                                                            <rect key="frame" x="56" y="0.0" width="268.5" height="48"/>
   61.67 -                                                            <subviews>
   61.68 -                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" text="Hannibal Chew" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hFh-wv-YAc" userLabel="PartnerNameLabel">
   61.69 -                                                                    <rect key="frame" x="0.0" y="0.0" width="268.5" height="20.5"/>
   61.70 -                                                                    <accessibility key="accessibilityConfiguration" identifier="partnerNameLabel"/>
   61.71 -                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
   61.72 -                                                                    <nil key="textColor"/>
   61.73 -                                                                    <nil key="highlightedColor"/>
   61.74 -                                                                </label>
   61.75 -                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" text="Privacy Status: Mistrusted" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5RJ-Gx-qBT" userLabel="PrivacyStatusLabel">
   61.76 -                                                                    <rect key="frame" x="0.0" y="30" width="268.5" height="18"/>
   61.77 -                                                                    <accessibility key="accessibilityConfiguration" identifier="privacyStatusTitle"/>
   61.78 -                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
   61.79 -                                                                    <nil key="textColor"/>
   61.80 -                                                                    <nil key="highlightedColor"/>
   61.81 -                                                                </label>
   61.82 -                                                            </subviews>
   61.83 -                                                        </stackView>
   61.84 -                                                    </subviews>
   61.85 -                                                    <constraints>
   61.86 -                                                        <constraint firstAttribute="height" constant="48" id="J8w-pv-TxH"/>
   61.87 -                                                    </constraints>
   61.88 -                                                </stackView>
   61.89 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" verticalHuggingPriority="251" text="Your communication partner is mistrusted." textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eaF-0u-kGb" userLabel="PrivacyStatusDescription">
   61.90 -                                                    <rect key="frame" x="0.0" y="68" width="324.5" height="20.5"/>
   61.91 -                                                    <accessibility key="accessibilityConfiguration" identifier="privacyStatusDescription"/>
   61.92 -                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   61.93 -                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
   61.94 -                                                    <nil key="highlightedColor"/>
   61.95 -                                                </label>
   61.96 -                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y4f-BW-EI0" userLabel="StartStopTrustingButton">
   61.97 -                                                    <rect key="frame" x="0.0" y="108.5" width="324.5" height="108"/>
   61.98 -                                                    <accessibility key="accessibilityConfiguration" identifier="startStopTrustingButton"/>
   61.99 -                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
  61.100 -                                                    <state key="normal" title="Stop Trusting"/>
  61.101 -                                                    <connections>
  61.102 -                                                        <action selector="startStopTrustingAction:" destination="amH-Dy-6D1" eventType="touchUpInside" id="XzM-B3-yD3"/>
  61.103 -                                                    </connections>
  61.104 -                                                </button>
  61.105 -                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" verticalHuggingPriority="251" verticalCompressionResistancePriority="752" text="OUTDISTANCE BLAH BLAH2" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lHS-sc-yWR" userLabel="TrustWordsLabel">
  61.106 -                                                    <rect key="frame" x="0.0" y="236.5" width="324.5" height="20.5"/>
  61.107 -                                                    <accessibility key="accessibilityConfiguration" label="trustWordsLabel"/>
  61.108 -                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  61.109 -                                                    <nil key="textColor"/>
  61.110 -                                                    <nil key="highlightedColor"/>
  61.111 -                                                </label>
  61.112 -                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="O51-e1-VQJ" userLabel="TrustButtonsStackView">
  61.113 -                                                    <rect key="frame" x="0.0" y="277" width="324.5" height="33"/>
  61.114 -                                                    <subviews>
  61.115 -                                                        <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="dbO-2K-SpB" userLabel="WrongButton" customClass="HandshakeButton" customModule="pEpForiOS" customModuleProvider="target">
  61.116 -                                                            <rect key="frame" x="0.0" y="0.0" width="162" height="33"/>
  61.117 -                                                            <accessibility key="accessibilityConfiguration" label="wrongButton"/>
  61.118 -                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
  61.119 -                                                            <state key="normal" title="Wrong Trustwords"/>
  61.120 -                                                            <connections>
  61.121 -                                                                <action selector="wrongAction:" destination="amH-Dy-6D1" eventType="touchUpInside" id="UGm-r5-suP"/>
  61.122 -                                                            </connections>
  61.123 -                                                        </button>
  61.124 -                                                        <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="Jgi-7k-Ymf" userLabel="ConfirmButton" customClass="HandshakeButton" customModule="pEpForiOS" customModuleProvider="target">
  61.125 -                                                            <rect key="frame" x="162" y="0.0" width="162.5" height="33"/>
  61.126 -                                                            <accessibility key="accessibilityConfiguration" label="confirmButton"/>
  61.127 -                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
  61.128 -                                                            <state key="normal" title="Confirm Trustwords"/>
  61.129 -                                                            <connections>
  61.130 -                                                                <action selector="confirmAction:" destination="amH-Dy-6D1" eventType="touchUpInside" id="0Ra-lN-sx4"/>
  61.131 -                                                            </connections>
  61.132 -                                                        </button>
  61.133 -                                                    </subviews>
  61.134 -                                                </stackView>
  61.135 -                                            </subviews>
  61.136 -                                            <constraints>
  61.137 -                                                <constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="DSR-3E-hwX"/>
  61.138 -                                            </constraints>
  61.139 -                                        </stackView>
  61.140 -                                    </subviews>
  61.141 -                                    <constraints>
  61.142 -                                        <constraint firstItem="1sS-UJ-WGa" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="sNy-KY-p78" secondAttribute="leading" constant="20" symbolic="YES" id="20U-Gy-p1p"/>
  61.143 -                                        <constraint firstAttribute="bottom" secondItem="1sS-UJ-WGa" secondAttribute="bottom" priority="999" constant="20" symbolic="YES" id="JYw-x4-mYZ"/>
  61.144 -                                        <constraint firstItem="1sS-UJ-WGa" firstAttribute="centerX" secondItem="sNy-KY-p78" secondAttribute="centerX" id="WDB-y7-IQj"/>
  61.145 -                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1sS-UJ-WGa" secondAttribute="trailing" constant="20" symbolic="YES" id="XD8-ti-pfw"/>
  61.146 -                                        <constraint firstItem="1sS-UJ-WGa" firstAttribute="top" secondItem="sNy-KY-p78" secondAttribute="top" priority="999" constant="20" symbolic="YES" id="aok-3R-P8F"/>
  61.147 -                                    </constraints>
  61.148 -                                </tableViewCellContentView>
  61.149 -                                <accessibility key="accessibilityConfiguration" identifier="handshakePartnerCell"/>
  61.150 -                                <connections>
  61.151 -                                    <outlet property="confirmButton" destination="Jgi-7k-Ymf" id="HLm-tc-MV5"/>
  61.152 -                                    <outlet property="headerView" destination="Hwo-n8-tYE" id="zNp-a3-bgC"/>
  61.153 -                                    <outlet property="pEpStatusImageView" destination="hZH-e1-puE" id="YT2-Mj-hro"/>
  61.154 -                                    <outlet property="partnerImageView" destination="rG1-9L-QdA" id="Czw-W0-5iJ"/>
  61.155 -                                    <outlet property="partnerNameLabel" destination="hFh-wv-YAc" id="ZDB-k9-YM8"/>
  61.156 -                                    <outlet property="privacyStatusDescription" destination="eaF-0u-kGb" id="VWh-tP-wgG"/>
  61.157 -                                    <outlet property="privacyStatusTitle" destination="5RJ-Gx-qBT" id="0qJ-kY-o93"/>
  61.158 -                                    <outlet property="startStopTrustingButton" destination="Y4f-BW-EI0" id="MXW-Ms-cMz"/>
  61.159 -                                    <outlet property="trustMistrustButtonsStackView" destination="O51-e1-VQJ" id="BVf-gU-GaJ"/>
  61.160 -                                    <outlet property="trustWordsLabel" destination="lHS-sc-yWR" id="9rC-fg-eDL"/>
  61.161 -                                    <outlet property="wrongButton" destination="dbO-2K-SpB" id="Noy-9E-GaM"/>
  61.162 -                                </connections>
  61.163 -                            </tableViewCell>
  61.164 -                        </prototypes>
  61.165 -                        <connections>
  61.166 -                            <outlet property="dataSource" destination="Jbh-LP-Jl1" id="LrB-dE-w8O"/>
  61.167 -                            <outlet property="delegate" destination="Jbh-LP-Jl1" id="hEP-pb-5wi"/>
  61.168 -                        </connections>
  61.169 -                    </tableView>
  61.170 -                    <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
  61.171 -                    <navigationItem key="navigationItem" id="H02-bM-GVd"/>
  61.172 -                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
  61.173 -                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
  61.174 -                    <connections>
  61.175 -                        <segue destination="ycz-bZ-1Ap" kind="presentation" identifier="showLanguagesSegue" id="ZbR-d7-Kex"/>
  61.176 -                    </connections>
  61.177 -                </tableViewController>
  61.178 -                <placeholder placeholderIdentifier="IBFirstResponder" id="Bd2-r6-Ksy" userLabel="First Responder" sceneMemberID="firstResponder"/>
  61.179 -            </objects>
  61.180 -            <point key="canvasLocation" x="8546.25" y="338.02816901408448"/>
  61.181 -        </scene>
  61.182 -        <!--Language List View Controller-->
  61.183 -        <scene sceneID="EqX-ke-To3">
  61.184 -            <objects>
  61.185 -                <tableViewController id="vyv-kT-FSV" customClass="LanguageListViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  61.186 -                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="9Ac-tj-VNI">
  61.187 -                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
  61.188 -                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  61.189 -                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  61.190 -                        <prototypes>
  61.191 -                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="LanguageListCell" rowHeight="80" id="dSX-lN-Kww" customClass="LanguageListTableViewCell" customModule="pEpForiOS" customModuleProvider="target">
  61.192 -                                <rect key="frame" x="0.0" y="28" width="1024" height="80"/>
  61.193 -                                <autoresizingMask key="autoresizingMask"/>
  61.194 -                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dSX-lN-Kww" id="k3Y-i6-hhG">
  61.195 -                                    <rect key="frame" x="0.0" y="0.0" width="1024" height="79.5"/>
  61.196 -                                    <autoresizingMask key="autoresizingMask"/>
  61.197 -                                    <subviews>
  61.198 -                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o5v-C8-2iy" userLabel="sentenceLabel">
  61.199 -                                            <rect key="frame" x="20" y="11" width="984" height="20.5"/>
  61.200 -                                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
  61.201 -                                            <nil key="textColor"/>
  61.202 -                                            <nil key="highlightedColor"/>
  61.203 -                                        </label>
  61.204 -                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KmG-tH-SGP" userLabel="languageLabel">
  61.205 -                                            <rect key="frame" x="20" y="39.5" width="984" height="29.5"/>
  61.206 -                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
  61.207 -                                            <nil key="textColor"/>
  61.208 -                                            <nil key="highlightedColor"/>
  61.209 -                                        </label>
  61.210 -                                    </subviews>
  61.211 -                                    <constraints>
  61.212 -                                        <constraint firstAttribute="bottomMargin" secondItem="KmG-tH-SGP" secondAttribute="bottom" id="TQI-ya-6dZ"/>
  61.213 -                                        <constraint firstItem="o5v-C8-2iy" firstAttribute="leading" secondItem="k3Y-i6-hhG" secondAttribute="leadingMargin" id="bEX-KV-0KK"/>
  61.214 -                                        <constraint firstAttribute="trailingMargin" secondItem="o5v-C8-2iy" secondAttribute="trailing" id="djz-Ge-fvf"/>
  61.215 -                                        <constraint firstItem="KmG-tH-SGP" firstAttribute="top" secondItem="o5v-C8-2iy" secondAttribute="bottom" constant="8" symbolic="YES" id="efc-da-u4v"/>
  61.216 -                                        <constraint firstAttribute="trailingMargin" secondItem="KmG-tH-SGP" secondAttribute="trailing" id="kv5-cl-MPY"/>
  61.217 -                                        <constraint firstItem="o5v-C8-2iy" firstAttribute="top" secondItem="k3Y-i6-hhG" secondAttribute="topMargin" id="r64-yx-EDY"/>
  61.218 -                                        <constraint firstItem="KmG-tH-SGP" firstAttribute="leading" secondItem="o5v-C8-2iy" secondAttribute="leading" id="xmP-Iz-8c3"/>
  61.219 -                                    </constraints>
  61.220 -                                </tableViewCellContentView>
  61.221 -                                <connections>
  61.222 -                                    <outlet property="languageLabel" destination="KmG-tH-SGP" id="xmE-bW-WXC"/>
  61.223 -                                    <outlet property="sentenceLabel" destination="o5v-C8-2iy" id="qtq-rV-Krd"/>
  61.224 -                                    <segue destination="KPI-q6-aJ8" kind="unwind" identifier="selectedLanguageSegue" unwindAction="languageSelectedActionWithUnwindSegue:" id="1bS-2P-cfd"/>
  61.225 -                                </connections>
  61.226 -                            </tableViewCell>
  61.227 -                        </prototypes>
  61.228 -                        <connections>
  61.229 -                            <outlet property="dataSource" destination="vyv-kT-FSV" id="X4W-rU-aZ9"/>
  61.230 -                            <outlet property="delegate" destination="vyv-kT-FSV" id="Xh7-8X-pM3"/>
  61.231 -                        </connections>
  61.232 -                    </tableView>
  61.233 -                    <navigationItem key="navigationItem" id="EAK-jv-4HL"/>
  61.234 -                </tableViewController>
  61.235 -                <placeholder placeholderIdentifier="IBFirstResponder" id="qXl-4i-ytm" userLabel="First Responder" sceneMemberID="firstResponder"/>
  61.236 -                <exit id="KPI-q6-aJ8" userLabel="Exit" sceneMemberID="exit"/>
  61.237 -            </objects>
  61.238 -            <point key="canvasLocation" x="10291.875" y="338.02816901408448"/>
  61.239 -        </scene>
  61.240 -        <!--Navigation Controller-->
  61.241 -        <scene sceneID="G0l-hT-NVW">
  61.242 -            <objects>
  61.243 -                <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="ycz-bZ-1Ap" sceneMemberID="viewController">
  61.244 -                    <toolbarItems/>
  61.245 -                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="S57-lS-p75">
  61.246 -                        <autoresizingMask key="autoresizingMask"/>
  61.247 -                    </navigationBar>
  61.248 -                    <nil name="viewControllers"/>
  61.249 -                    <connections>
  61.250 -                        <segue destination="vyv-kT-FSV" kind="relationship" relationship="rootViewController" id="HXl-8R-EeW"/>
  61.251 -                    </connections>
  61.252 -                </navigationController>
  61.253 -                <placeholder placeholderIdentifier="IBFirstResponder" id="5l2-Lz-xoQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
  61.254 -            </objects>
  61.255 -            <point key="canvasLocation" x="9352.5" y="338.02816901408448"/>
  61.256 -        </scene>
  61.257 -        <!--Navigation Controller-->
  61.258 -        <scene sceneID="LdW-n0-VeJ">
  61.259 -            <objects>
  61.260 -                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="PZt-VJ-X5t" sceneMemberID="viewController">
  61.261 -                    <toolbarItems/>
  61.262 -                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="0Ex-jP-6bo">
  61.263 -                        <rect key="frame" x="0.0" y="20" width="1024" height="50"/>
  61.264 -                        <autoresizingMask key="autoresizingMask"/>
  61.265 -                    </navigationBar>
  61.266 -                    <nil name="viewControllers"/>
  61.267 -                    <connections>
  61.268 -                        <segue destination="Jbh-LP-Jl1" kind="relationship" relationship="rootViewController" id="nBy-aW-MRE"/>
  61.269 -                    </connections>
  61.270 -                </navigationController>
  61.271 -                <placeholder placeholderIdentifier="IBFirstResponder" id="RUc-NB-W2N" userLabel="First Responder" sceneMemberID="firstResponder"/>
  61.272 -            </objects>
  61.273 -            <point key="canvasLocation" x="7548.75" y="338.02816901408448"/>
  61.274 -        </scene>
  61.275 -    </scenes>
  61.276 -    <resources>
  61.277 -        <image name="empty-avatar" width="150" height="150"/>
  61.278 -    </resources>
  61.279 -</document>
    62.1 --- a/pEpForiOS/Base.lproj/Main.storyboard	Tue Feb 18 18:23:43 2020 +0100
    62.2 +++ b/pEpForiOS/Base.lproj/Main.storyboard	Thu Mar 12 09:49:46 2020 +0100
    62.3 @@ -14,28 +14,6 @@
    62.4          </array>
    62.5      </customFonts>
    62.6      <scenes>
    62.7 -        <!--Navigation Controller-->
    62.8 -        <scene sceneID="e1W-O0-7gY">
    62.9 -            <objects>
   62.10 -                <navigationController toolbarHidden="NO" id="tTN-8A-7tU" sceneMemberID="viewController">
   62.11 -                    <navigationItem key="navigationItem" id="QPh-8P-Ikk"/>
   62.12 -                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
   62.13 -                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="o6J-NN-Zae">
   62.14 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   62.15 -                        <autoresizingMask key="autoresizingMask"/>
   62.16 -                    </navigationBar>
   62.17 -                    <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="vuK-vG-hkr">
   62.18 -                        <rect key="frame" x="0.0" y="623" width="375" height="44"/>
   62.19 -                        <autoresizingMask key="autoresizingMask"/>
   62.20 -                    </toolbar>
   62.21 -                    <connections>
   62.22 -                        <segue destination="fRo-D2-Fjz" kind="relationship" relationship="rootViewController" id="UBr-Ll-cMP"/>
   62.23 -                    </connections>
   62.24 -                </navigationController>
   62.25 -                <placeholder placeholderIdentifier="IBFirstResponder" id="wYS-Rz-jbd" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
   62.26 -            </objects>
   62.27 -            <point key="canvasLocation" x="2818" y="-757"/>
   62.28 -        </scene>
   62.29          <!--EmailListViewController-->
   62.30          <scene sceneID="ed4-cB-BMk">
   62.31              <objects>
   62.32 @@ -45,73 +23,35 @@
   62.33                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   62.34                          <subviews>
   62.35                              <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="1Oj-l2-jRA">
   62.36 -                                <rect key="frame" x="0.0" y="44" width="375" height="574"/>
   62.37 +                                <rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
   62.38                                  <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
   62.39                                  <prototypes>
   62.40 -                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EmailListViewCell" rowHeight="90" id="uoK-uW-SqQ" customClass="EmailListViewCell" customModule="pEpForiOS" customModuleProvider="target">
   62.41 -                                        <rect key="frame" x="0.0" y="28" width="375" height="90"/>
   62.42 +                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EmailListViewCell" id="uoK-uW-SqQ" customClass="EmailListViewCell" customModule="pEpForiOS" customModuleProvider="target">
   62.43 +                                        <rect key="frame" x="0.0" y="28" width="375" height="80.5"/>
   62.44                                          <autoresizingMask key="autoresizingMask"/>
   62.45                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uoK-uW-SqQ" id="DUw-sX-YAB">
   62.46 -                                            <rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
   62.47 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="80.5"/>
   62.48                                              <autoresizingMask key="autoresizingMask"/>
   62.49                                              <subviews>
   62.50                                                  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QAL-Vw-DX8">
   62.51 -                                                    <rect key="frame" x="5" y="0.0" width="365" height="90"/>
   62.52 +                                                    <rect key="frame" x="5" y="0.0" width="365" height="80.5"/>
   62.53                                                      <subviews>
   62.54 -                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" text="Sender" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KTi-T9-Inm">
   62.55 -                                                            <rect key="frame" x="68" y="5" width="52" height="19.5"/>
   62.56 -                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
   62.57 -                                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
   62.58 -                                                            <nil key="highlightedColor"/>
   62.59 -                                                        </label>
   62.60 -                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="1000" text="Summary" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tbi-dG-KCA">
   62.61 -                                                            <rect key="frame" x="68" y="52" width="289" height="20.5"/>
   62.62 -                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   62.63 -                                                            <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
   62.64 -                                                            <nil key="highlightedColor"/>
   62.65 -                                                        </label>
   62.66 -                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="1000" text="Subject" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ha5-Vd-x3U">
   62.67 -                                                            <rect key="frame" x="68" y="28.5" width="272" height="19.5"/>
   62.68 -                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
   62.69 -                                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
   62.70 -                                                            <nil key="highlightedColor"/>
   62.71 -                                                        </label>
   62.72 -                                                        <stackView opaque="NO" contentMode="scaleAspectFit" distribution="fillProportionally" alignment="center" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="bNf-Dy-rbx">
   62.73 -                                                            <rect key="frame" x="343" y="32.5" width="14" height="14"/>
   62.74 +                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wra-Ql-iZp">
   62.75 +                                                            <rect key="frame" x="5" y="15.5" width="72" height="50"/>
   62.76                                                              <subviews>
   62.77 -                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="attachment-list-icon" translatesAutoresizingMaskIntoConstraints="NO" id="qYK-Q0-GO5">
   62.78 -                                                                    <rect key="frame" x="-14" y="0.0" width="14" height="14"/>
   62.79 -                                                                    <constraints>
   62.80 -                                                                        <constraint firstAttribute="width" secondItem="qYK-Q0-GO5" secondAttribute="height" multiplier="1:1" id="grm-uS-Iyi"/>
   62.81 -                                                                        <constraint firstAttribute="height" constant="14" id="mYl-DL-WXV"/>
   62.82 -                                                                    </constraints>
   62.83 -                                                                </imageView>
   62.84 -                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hoT-RP-AkI" userLabel="Flagged icon">
   62.85 -                                                                    <rect key="frame" x="0.0" y="0.0" width="14" height="14"/>
   62.86 +                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" insetsLayoutMarginsFromSafeArea="NO" image="pEp-status-yellow_white-border" translatesAutoresizingMaskIntoConstraints="NO" id="gja-fY-c60">
   62.87 +                                                                    <rect key="frame" x="-2" y="17" width="16" height="16"/>
   62.88                                                                      <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
   62.89                                                                      <constraints>
   62.90 -                                                                        <constraint firstAttribute="height" constant="14" id="Tci-gI-qeg"/>
   62.91 -                                                                        <constraint firstAttribute="width" secondItem="hoT-RP-AkI" secondAttribute="height" multiplier="1:1" id="VBW-bh-VLb"/>
   62.92 +                                                                        <constraint firstAttribute="width" secondItem="gja-fY-c60" secondAttribute="height" multiplier="1:1" id="Vs6-dF-zOe"/>
   62.93 +                                                                        <constraint firstAttribute="height" constant="16" id="ssx-xa-4Tt"/>
   62.94                                                                      </constraints>
   62.95 +                                                                    <userDefinedRuntimeAttributes>
   62.96 +                                                                        <userDefinedRuntimeAttribute type="boolean" keyPath="translatesAutoresizingMaskIntoConstraints" value="NO"/>
   62.97 +                                                                    </userDefinedRuntimeAttributes>
   62.98                                                                  </imageView>
   62.99 -                                                            </subviews>
  62.100 -                                                        </stackView>
  62.101 -                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="cG7-zS-ib7">
  62.102 -                                                            <rect key="frame" x="322.5" y="5" width="34.5" height="19.5"/>
  62.103 -                                                            <subviews>
  62.104 -                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a1D-BW-3Rd">
  62.105 -                                                                    <rect key="frame" x="0.0" y="0.0" width="34.5" height="19.5"/>
  62.106 -                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
  62.107 -                                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  62.108 -                                                                    <nil key="highlightedColor"/>
  62.109 -                                                                </label>
  62.110 -                                                            </subviews>
  62.111 -                                                        </stackView>
  62.112 -                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wra-Ql-iZp">
  62.113 -                                                            <rect key="frame" x="8" y="20" width="50" height="50"/>
  62.114 -                                                            <subviews>
  62.115 -                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="empty-avatar" translatesAutoresizingMaskIntoConstraints="NO" id="ocF-vy-7Ef" userLabel="Contact Image">
  62.116 -                                                                    <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
  62.117 +                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="empty-avatar" translatesAutoresizingMaskIntoConstraints="NO" id="ocF-vy-7Ef" userLabel="Contact Image">
  62.118 +                                                                    <rect key="frame" x="22" y="0.0" width="50" height="50"/>
  62.119                                                                      <constraints>
  62.120                                                                          <constraint firstAttribute="width" constant="50" id="SxH-gw-Ygu"/>
  62.121                                                                          <constraint firstAttribute="width" secondItem="ocF-vy-7Ef" secondAttribute="height" multiplier="1:1" id="nBE-3s-ERQ"/>
  62.122 @@ -120,44 +60,87 @@
  62.123                                                                          <userDefinedRuntimeAttribute type="boolean" keyPath="translatesAutoresizingMaskIntoConstraints" value="NO"/>
  62.124                                                                      </userDefinedRuntimeAttributes>
  62.125                                                                  </imageView>
  62.126 -                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" fixedFrame="YES" insetsLayoutMarginsFromSafeArea="NO" image="pEp-status-yellow_white-border" translatesAutoresizingMaskIntoConstraints="NO" id="gja-fY-c60">
  62.127 -                                                                    <rect key="frame" x="37" y="37" width="18" height="18"/>
  62.128 -                                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
  62.129 -                                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
  62.130 -                                                                    <userDefinedRuntimeAttributes>
  62.131 -                                                                        <userDefinedRuntimeAttribute type="boolean" keyPath="translatesAutoresizingMaskIntoConstraints" value="NO"/>
  62.132 -                                                                    </userDefinedRuntimeAttributes>
  62.133 -                                                                </imageView>
  62.134                                                              </subviews>
  62.135                                                              <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  62.136                                                              <constraints>
  62.137 -                                                                <constraint firstItem="ocF-vy-7Ef" firstAttribute="leading" secondItem="wra-Ql-iZp" secondAttribute="leading" id="Jve-F1-pdr"/>
  62.138 +                                                                <constraint firstItem="gja-fY-c60" firstAttribute="centerY" secondItem="wra-Ql-iZp" secondAttribute="centerY" id="GkE-5o-W8a"/>
  62.139                                                                  <constraint firstAttribute="bottom" secondItem="ocF-vy-7Ef" secondAttribute="bottom" id="bbx-Am-jgz"/>
  62.140                                                                  <constraint firstItem="ocF-vy-7Ef" firstAttribute="top" secondItem="wra-Ql-iZp" secondAttribute="top" id="eQL-Vi-ezR"/>
  62.141                                                                  <constraint firstAttribute="trailing" secondItem="ocF-vy-7Ef" secondAttribute="trailing" id="epg-GW-QI8"/>
  62.142 +                                                                <constraint firstItem="gja-fY-c60" firstAttribute="leading" secondItem="wra-Ql-iZp" secondAttribute="leading" constant="-2" id="mdf-hQ-6kD"/>
  62.143 +                                                                <constraint firstItem="ocF-vy-7Ef" firstAttribute="leading" secondItem="wra-Ql-iZp" secondAttribute="leading" constant="22" id="ria-SA-KqO"/>
  62.144                                                              </constraints>
  62.145                                                              <userDefinedRuntimeAttributes>
  62.146                                                                  <userDefinedRuntimeAttribute type="boolean" keyPath="translatesAutoresizingMaskIntoConstraints" value="NO"/>
  62.147                                                              </userDefinedRuntimeAttributes>
  62.148                                                          </view>
  62.149 +                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" text="Sender sfasflask jfhsajfkas fjksaj" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KTi-T9-Inm">
  62.150 +                                                            <rect key="frame" x="89" y="13" width="232.5" height="20.5"/>
  62.151 +                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  62.152 +                                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  62.153 +                                                            <nil key="highlightedColor"/>
  62.154 +                                                        </label>
  62.155 +                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="1000" text="Subject jlkfj glkafj kal jfa slfaj alsjf aslj fsajk" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ha5-Vd-x3U">
  62.156 +                                                            <rect key="frame" x="89" y="35.5" width="249" height="18"/>
  62.157 +                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
  62.158 +                                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  62.159 +                                                            <nil key="highlightedColor"/>
  62.160 +                                                        </label>
  62.161 +                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="1000" text="Summary" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tbi-dG-KCA">
  62.162 +                                                            <rect key="frame" x="89" y="55.5" width="65" height="18"/>
  62.163 +                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
  62.164 +                                                            <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
  62.165 +                                                            <nil key="highlightedColor"/>
  62.166 +                                                        </label>
  62.167 +                                                        <stackView opaque="NO" contentMode="scaleAspectFit" axis="vertical" distribution="fillProportionally" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="bNf-Dy-rbx">
  62.168 +                                                            <rect key="frame" x="341" y="33.5" width="16" height="16"/>
  62.169 +                                                            <subviews>
  62.170 +                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="attachment-list-icon" translatesAutoresizingMaskIntoConstraints="NO" id="qYK-Q0-GO5">
  62.171 +                                                                    <rect key="frame" x="1" y="-14" width="14" height="14"/>
  62.172 +                                                                    <constraints>
  62.173 +                                                                        <constraint firstAttribute="width" secondItem="qYK-Q0-GO5" secondAttribute="height" multiplier="1:1" id="grm-uS-Iyi"/>
  62.174 +                                                                        <constraint firstAttribute="height" constant="14" id="mYl-DL-WXV"/>
  62.175 +                                                                    </constraints>
  62.176 +                                                                </imageView>
  62.177 +                                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hoT-RP-AkI" userLabel="Flagged icon">
  62.178 +                                                                    <rect key="frame" x="0.0" y="0.0" width="16" height="16"/>
  62.179 +                                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
  62.180 +                                                                    <constraints>
  62.181 +                                                                        <constraint firstAttribute="height" constant="16" id="Tci-gI-qeg"/>
  62.182 +                                                                        <constraint firstAttribute="width" secondItem="hoT-RP-AkI" secondAttribute="height" multiplier="1:1" id="VBW-bh-VLb"/>
  62.183 +                                                                    </constraints>
  62.184 +                                                                </imageView>
  62.185 +                                                            </subviews>
  62.186 +                                                        </stackView>
  62.187 +                                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="cG7-zS-ib7">
  62.188 +                                                            <rect key="frame" x="324.5" y="4" width="32.5" height="29.5"/>
  62.189 +                                                            <subviews>
  62.190 +                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a1D-BW-3Rd">
  62.191 +                                                                    <rect key="frame" x="0.0" y="5.5" width="32.5" height="18"/>
  62.192 +                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
  62.193 +                                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  62.194 +                                                                    <nil key="highlightedColor"/>
  62.195 +                                                                </label>
  62.196 +                                                            </subviews>
  62.197 +                                                        </stackView>
  62.198                                                      </subviews>
  62.199                                                      <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  62.200                                                      <constraints>
  62.201                                                          <constraint firstItem="bNf-Dy-rbx" firstAttribute="trailing" secondItem="cG7-zS-ib7" secondAttribute="trailing" id="1kX-7Z-Wp1"/>
  62.202 -                                                        <constraint firstItem="KTi-T9-Inm" firstAttribute="leading" secondItem="wra-Ql-iZp" secondAttribute="trailing" constant="10" id="2Q8-nB-uOr"/>
  62.203 -                                                        <constraint firstItem="bNf-Dy-rbx" firstAttribute="leading" secondItem="ha5-Vd-x3U" secondAttribute="trailing" constant="3" id="2sZ-lc-cQ9"/>
  62.204 -                                                        <constraint firstItem="cG7-zS-ib7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="KTi-T9-Inm" secondAttribute="trailing" constant="8" id="4r1-41-t2J"/>
  62.205 -                                                        <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="Tbi-dG-KCA" secondAttribute="bottom" constant="5" id="6KS-3J-RlV"/>
  62.206 -                                                        <constraint firstItem="Tbi-dG-KCA" firstAttribute="trailing" secondItem="cG7-zS-ib7" secondAttribute="trailing" id="6xZ-zP-beZ"/>
  62.207 +                                                        <constraint firstItem="KTi-T9-Inm" firstAttribute="leading" secondItem="wra-Ql-iZp" secondAttribute="trailing" constant="12" id="2Q8-nB-uOr"/>
  62.208 +                                                        <constraint firstItem="bNf-Dy-rbx" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ha5-Vd-x3U" secondAttribute="trailing" constant="3" id="2sZ-lc-cQ9"/>
  62.209 +                                                        <constraint firstItem="cG7-zS-ib7" firstAttribute="top" secondItem="QAL-Vw-DX8" secondAttribute="top" constant="4" id="3dg-p8-pfk"/>
  62.210 +                                                        <constraint firstItem="cG7-zS-ib7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="KTi-T9-Inm" secondAttribute="trailing" constant="3" id="4r1-41-t2J"/>
  62.211                                                          <constraint firstItem="Tbi-dG-KCA" firstAttribute="leading" secondItem="ha5-Vd-x3U" secondAttribute="leading" id="7RK-nG-z25"/>
  62.212                                                          <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="80" id="8Jk-1U-d4g"/>
  62.213 -                                                        <constraint firstItem="ha5-Vd-x3U" firstAttribute="top" secondItem="KTi-T9-Inm" secondAttribute="bottom" constant="4" id="AcE-gd-F4j"/>
  62.214 -                                                        <constraint firstItem="Tbi-dG-KCA" firstAttribute="top" secondItem="ha5-Vd-x3U" secondAttribute="bottom" constant="4" id="EWr-iZ-sou"/>
  62.215 +                                                        <constraint firstItem="ha5-Vd-x3U" firstAttribute="top" secondItem="KTi-T9-Inm" secondAttribute="bottom" constant="2" id="AcE-gd-F4j"/>
  62.216 +                                                        <constraint firstItem="Tbi-dG-KCA" firstAttribute="top" secondItem="ha5-Vd-x3U" secondAttribute="bottom" constant="2" id="EWr-iZ-sou"/>
  62.217                                                          <constraint firstItem="wra-Ql-iZp" firstAttribute="centerY" secondItem="QAL-Vw-DX8" secondAttribute="centerY" id="NYO-5O-s1e"/>
  62.218 -                                                        <constraint firstItem="KTi-T9-Inm" firstAttribute="top" secondItem="QAL-Vw-DX8" secondAttribute="top" constant="5" id="UNc-1Y-dmh"/>
  62.219 -                                                        <constraint firstItem="wra-Ql-iZp" firstAttribute="leading" secondItem="QAL-Vw-DX8" secondAttribute="leading" constant="8" id="Zk3-pH-lWx"/>
  62.220 -                                                        <constraint firstItem="bNf-Dy-rbx" firstAttribute="top" secondItem="cG7-zS-ib7" secondAttribute="bottom" constant="8" id="qZO-Ed-KJB"/>
  62.221 +                                                        <constraint firstItem="wra-Ql-iZp" firstAttribute="leading" secondItem="QAL-Vw-DX8" secondAttribute="leading" constant="5" id="Zk3-pH-lWx"/>
  62.222 +                                                        <constraint firstItem="wra-Ql-iZp" firstAttribute="top" secondItem="KTi-T9-Inm" secondAttribute="bottom" constant="-18" id="Zwe-IE-5bI"/>
  62.223 +                                                        <constraint firstItem="bNf-Dy-rbx" firstAttribute="top" secondItem="cG7-zS-ib7" secondAttribute="bottom" id="qZO-Ed-KJB"/>
  62.224                                                          <constraint firstAttribute="trailing" secondItem="cG7-zS-ib7" secondAttribute="trailing" constant="8" id="w3K-mr-2DF"/>
  62.225 +                                                        <constraint firstItem="bNf-Dy-rbx" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Tbi-dG-KCA" secondAttribute="trailing" constant="3" id="xQC-aZ-P1E"/>
  62.226                                                          <constraint firstItem="ha5-Vd-x3U" firstAttribute="leading" secondItem="KTi-T9-Inm" secondAttribute="leading" id="xlw-MY-AJ5"/>
  62.227                                                          <constraint firstItem="KTi-T9-Inm" firstAttribute="bottom" secondItem="cG7-zS-ib7" secondAttribute="bottom" id="yAV-Kr-YrE"/>
  62.228                                                      </constraints>
  62.229 @@ -217,7 +200,6 @@
  62.230                      <connections>
  62.231                          <outlet property="enableFilterButton" destination="qvK-qQ-Gk6" id="c4d-QA-utg"/>
  62.232                          <outlet property="tableView" destination="1Oj-l2-jRA" id="dbk-cO-CLi"/>
  62.233 -                        <segue destination="tTN-8A-7tU" kind="show" identifier="segueShowEmailNotSplitView" id="uOM-R2-1sE"/>
  62.234                          <segue destination="Rly-af-89k" kind="presentation" identifier="segueAddNewAccount" id="Sq5-Lx-gH6"/>
  62.235                          <segue destination="NY2-HI-4ou" kind="presentation" identifier="segueReplyAll" id="yAp-Cu-TCw"/>
  62.236                          <segue destination="NY2-HI-4ou" kind="presentation" identifier="segueForward" id="ok6-PZ-sCI"/>
  62.237 @@ -225,7 +207,7 @@
  62.238                          <segue destination="NY2-HI-4ou" kind="presentation" identifier="segueEditDraft" id="VVX-sZ-2dU"/>
  62.239                          <segue destination="WY0-yJ-1SU" kind="presentation" identifier="segueShowMoveToFolder" id="cRe-YG-393"/>
  62.240                          <segue destination="nc4-kR-K9D" kind="show" identifier="segueShowFilter" id="t4t-3T-ovM"/>
  62.241 -                        <segue destination="tTN-8A-7tU" kind="showDetail" identifier="segueShowEmailSplitView" id="HHz-at-Ehg"/>
  62.242 +                        <segue destination="fRo-D2-Fjz" kind="showDetail" identifier="segueShowEmail" id="bq8-0O-guL"/>
  62.243                      </connections>
  62.244                  </viewController>
  62.245                  <placeholder placeholderIdentifier="IBFirstResponder" id="m6c-dF-C80" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  62.246 @@ -255,11 +237,11 @@
  62.247              <objects>
  62.248                  <viewController storyboardIdentifier="EmailDetailViewController" id="fRo-D2-Fjz" customClass="EmailDetailViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  62.249                      <view key="view" contentMode="scaleToFill" id="JE8-0O-ekz">
  62.250 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="574"/>
  62.251 +                        <rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
  62.252                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  62.253                          <subviews>
  62.254                              <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="HP3-Sj-MgZ">
  62.255 -                                <rect key="frame" x="0.0" y="0.0" width="375" height="574"/>
  62.256 +                                <rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
  62.257                                  <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  62.258                                  <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="LwL-nB-lHm">
  62.259                                      <size key="itemSize" width="50" height="50"/>
  62.260 @@ -269,7 +251,7 @@
  62.261                                  </collectionViewFlowLayout>
  62.262                                  <cells>
  62.263                                      <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" reuseIdentifier="XIB used - do not instantiate" id="kIE-Eq-O7W">
  62.264 -                                        <rect key="frame" x="0.0" y="-38.5" width="375" height="651"/>
  62.265 +                                        <rect key="frame" x="0.0" y="-16.5" width="375" height="651"/>
  62.266                                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  62.267                                          <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="tKR-Vh-qyF">
  62.268                                              <rect key="frame" x="0.0" y="0.0" width="375" height="651"/>
  62.269 @@ -324,12 +306,12 @@
  62.270                      </toolbarItems>
  62.271                      <navigationItem key="navigationItem" id="x3Y-Mc-0bu">
  62.272                          <leftBarButtonItems>
  62.273 -                            <barButtonItem image="chevron-icon-up" id="icA-8s-JIg" userLabel="previous">
  62.274 +                            <barButtonItem id="icA-8s-JIg" userLabel="previous">
  62.275                                  <connections>
  62.276                                      <action selector="previousButtonPressed:" destination="fRo-D2-Fjz" id="T7l-k1-fbw"/>
  62.277                                  </connections>
  62.278                              </barButtonItem>
  62.279 -                            <barButtonItem image="chevron-icon-down" id="Lee-9l-s9y" userLabel="next">
  62.280 +                            <barButtonItem id="Lee-9l-s9y" userLabel="next">
  62.281                                  <connections>
  62.282                                      <action selector="nextButtonPressed:" destination="fRo-D2-Fjz" id="2j3-S3-wMK"/>
  62.283                                  </connections>
  62.284 @@ -364,8 +346,7 @@
  62.285                          <segue destination="NY2-HI-4ou" kind="presentation" identifier="segueReplyAllForm" id="r2P-Ra-zWf"/>
  62.286                          <segue destination="NY2-HI-4ou" kind="presentation" identifier="segueForward" id="0Yg-lj-kVR"/>
  62.287                          <segue destination="WY0-yJ-1SU" kind="presentation" identifier="segueShowMoveToFolder" id="g1q-wK-tff"/>
  62.288 -                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueHandshake" id="CKh-jT-ski"/>
  62.289 -                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueHandshakeCollapsed" id="Gcx-48-ZRF"/>
  62.290 +                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueTrustManagement" id="CKh-jT-ski"/>
  62.291                      </connections>
  62.292                  </viewController>
  62.293                  <placeholder placeholderIdentifier="IBFirstResponder" id="NqX-Lg-wmy" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  62.294 @@ -459,13 +440,13 @@
  62.295                                      <autoresizingMask key="autoresizingMask"/>
  62.296                                      <subviews>
  62.297                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Sender" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hnw-Tp-mga">
  62.298 -                                            <rect key="frame" x="20" y="11" width="331" height="33"/>
  62.299 +                                            <rect key="frame" x="20" y="11" width="331" height="33.5"/>
  62.300                                              <fontDescription key="fontDescription" name="SFUIText-Regular" family="SF UI Text" pointSize="13"/>
  62.301                                              <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  62.302                                              <nil key="highlightedColor"/>
  62.303                                          </label>
  62.304                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To: Recipients" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-AS-hpP">
  62.305 -                                            <rect key="frame" x="20" y="50" width="331" height="16"/>
  62.306 +                                            <rect key="frame" x="20" y="50.5" width="331" height="15.5"/>
  62.307                                              <fontDescription key="fontDescription" name="SFUIText-Regular" family="SF UI Text" pointSize="13"/>
  62.308                                              <color key="textColor" red="0.5490196078431373" green="0.5490196078431373" blue="0.5490196078431373" alpha="1" colorSpace="calibratedRGB"/>
  62.309                                              <nil key="highlightedColor"/>
  62.310 @@ -604,8 +585,8 @@
  62.311                          <segue destination="NY2-HI-4ou" kind="presentation" identifier="segueReplyAllForm" id="1zD-EW-3fN"/>
  62.312                          <segue destination="NY2-HI-4ou" kind="presentation" identifier="segueForward" id="2fD-kL-Bvj"/>
  62.313                          <segue destination="WY0-yJ-1SU" kind="presentation" identifier="segueShowMoveToFolder" modalPresentationStyle="pageSheet" id="RTR-We-Kc1"/>
  62.314 -                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueHandshake" modalPresentationStyle="automatic" id="mZj-Mg-VzM"/>
  62.315 -                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueHandshakeCollapsed" modalPresentationStyle="fullScreen" id="0zl-tV-6Kr"/>
  62.316 +                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueTrustManagement" modalPresentationStyle="automatic" id="mZj-Mg-VzM"/>
  62.317 +                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueTrustManagementCollapsed" modalPresentationStyle="fullScreen" id="0zl-tV-6Kr"/>
  62.318                      </connections>
  62.319                  </tableViewController>
  62.320                  <placeholder placeholderIdentifier="IBFirstResponder" id="C92-OM-qzy" userLabel="First Responder" sceneMemberID="firstResponder"/>
  62.321 @@ -705,10 +686,10 @@
  62.322              </objects>
  62.323              <point key="canvasLocation" x="7911" y="-910"/>
  62.324          </scene>
  62.325 -        <!--Handshake-->
  62.326 +        <!--TrustManagement-->
  62.327          <scene sceneID="vNc-oF-Keh">
  62.328              <objects>
  62.329 -                <viewControllerPlaceholder storyboardName="Handshake" id="Dbs-KG-RkX" sceneMemberID="viewController"/>
  62.330 +                <viewControllerPlaceholder storyboardName="TrustManagement" id="Dbs-KG-RkX" sceneMemberID="viewController"/>
  62.331                  <placeholder placeholderIdentifier="IBFirstResponder" id="Vev-AJ-nPB" userLabel="First Responder" sceneMemberID="firstResponder"/>
  62.332              </objects>
  62.333              <point key="canvasLocation" x="5522" y="-470"/>
  62.334 @@ -976,41 +957,18 @@
  62.335                      <size key="freeformSize" width="375" height="800"/>
  62.336                      <connections>
  62.337                          <outlet property="sendButton" destination="yQg-rY-YPK" id="lhg-qw-PDF"/>
  62.338 -                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueHandshake" modalPresentationStyle="fullScreen" id="JbP-D9-Vpg"/>
  62.339 +                        <segue destination="Dbs-KG-RkX" kind="presentation" identifier="segueTrustManagement" modalPresentationStyle="fullScreen" id="JbP-D9-Vpg"/>
  62.340                      </connections>
  62.341                  </tableViewController>
  62.342                  <placeholder placeholderIdentifier="IBFirstResponder" id="te3-X0-7QD" userLabel="First Responder" sceneMemberID="firstResponder"/>
  62.343              </objects>
  62.344              <point key="canvasLocation" x="5252" y="833"/>
  62.345          </scene>
  62.346 -        <!--Email List Navigation View Controller-->
  62.347 -        <scene sceneID="MZI-Ie-O3U">
  62.348 -            <objects>
  62.349 -                <navigationController storyboardIdentifier="EmailListNavigationViewController" toolbarHidden="NO" id="whh-KX-6ih" customClass="EmailListNavigationViewController" sceneMemberID="viewController">
  62.350 -                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
  62.351 -                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="saS-nD-pye">
  62.352 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  62.353 -                        <autoresizingMask key="autoresizingMask"/>
  62.354 -                    </navigationBar>
  62.355 -                    <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="44P-as-CSR">
  62.356 -                        <rect key="frame" x="0.0" y="623" width="375" height="44"/>
  62.357 -                        <autoresizingMask key="autoresizingMask"/>
  62.358 -                    </toolbar>
  62.359 -                    <connections>
  62.360 -                        <segue destination="ldy-GA-D6J" kind="relationship" relationship="rootViewController" id="0mb-3K-5Pd"/>
  62.361 -                    </connections>
  62.362 -                </navigationController>
  62.363 -                <placeholder placeholderIdentifier="IBFirstResponder" id="e7d-28-DBt" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  62.364 -            </objects>
  62.365 -            <point key="canvasLocation" x="2942" y="-2591"/>
  62.366 -        </scene>
  62.367      </scenes>
  62.368      <resources>
  62.369          <image name="attachment-list-icon" width="14" height="15"/>
  62.370 -        <image name="chevron-icon-down" width="18" height="10"/>
  62.371          <image name="chevron-icon-left" width="10" height="18"/>
  62.372          <image name="chevron-icon-right" width="10" height="18"/>
  62.373 -        <image name="chevron-icon-up" width="18" height="10"/>
  62.374          <image name="compose" width="33" height="64"/>
  62.375          <image name="empty-avatar" width="150" height="150"/>
  62.376          <image name="pEp-status-yellow_white-border" width="21" height="21"/>
  62.377 @@ -1024,8 +982,7 @@
  62.378      </resources>
  62.379      <inferredMetricsTieBreakers>
  62.380          <segue reference="cRe-YG-393"/>
  62.381 -        <segue reference="JbP-D9-Vpg"/>
  62.382 -        <segue reference="ok6-PZ-sCI"/>
  62.383 -        <segue reference="HHz-at-Ehg"/>
  62.384 +        <segue reference="CKh-jT-ski"/>
  62.385 +        <segue reference="6by-Pi-xWQ"/>
  62.386      </inferredMetricsTieBreakers>
  62.387  </document>
    63.1 --- a/pEpForiOS/Base.lproj/Reusable.storyboard	Tue Feb 18 18:23:43 2020 +0100
    63.2 +++ b/pEpForiOS/Base.lproj/Reusable.storyboard	Thu Mar 12 09:49:46 2020 +0100
    63.3 @@ -1,6 +1,6 @@
    63.4  <?xml version="1.0" encoding="UTF-8"?>
    63.5  <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    63.6 -    <device id="retina4_7" orientation="portrait" appearance="light"/>
    63.7 +    <device id="retina4_0" orientation="portrait" appearance="light"/>
    63.8      <dependencies>
    63.9          <deployment identifier="iOS"/>
   63.10          <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
   63.11 @@ -13,7 +13,7 @@
   63.12              <objects>
   63.13                  <viewController storyboardIdentifier="SecureWebViewController" id="dOH-6Y-C6g" customClass="SecureWebViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   63.14                      <view key="view" contentMode="scaleToFill" id="shU-fE-sbz">
   63.15 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
   63.16 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   63.17                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   63.18                          <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   63.19                          <viewLayoutGuide key="safeArea" id="zmK-TD-BLC"/>
   63.20 @@ -28,25 +28,25 @@
   63.21              <objects>
   63.22                  <tableViewController storyboardIdentifier="SuggestTableViewController" id="rTs-IH-hJ1" customClass="SuggestTableViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   63.23                      <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="pgQ-Cd-09g">
   63.24 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
   63.25 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   63.26                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   63.27                          <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   63.28                          <prototypes>
   63.29                              <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ContactCell" rowHeight="50" id="cZv-Fa-cFj" customClass="ContactCell" customModule="pEpForiOS" customModuleProvider="target">
   63.30 -                                <rect key="frame" x="0.0" y="28" width="375" height="50"/>
   63.31 +                                <rect key="frame" x="0.0" y="28" width="320" height="50"/>
   63.32                                  <autoresizingMask key="autoresizingMask"/>
   63.33                                  <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="cZv-Fa-cFj" id="4of-pf-Zww">
   63.34 -                                    <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
   63.35 +                                    <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
   63.36                                      <autoresizingMask key="autoresizingMask"/>
   63.37                                      <subviews>
   63.38                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aAW-1y-cXc">
   63.39 -                                            <rect key="frame" x="14" y="5" width="345" height="18"/>
   63.40 +                                            <rect key="frame" x="14" y="5" width="290" height="18"/>
   63.41                                              <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
   63.42                                              <nil key="textColor"/>
   63.43                                              <nil key="highlightedColor"/>
   63.44                                          </label>
   63.45                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lcu-U0-qEs">
   63.46 -                                            <rect key="frame" x="14" y="29.5" width="345" height="16"/>
   63.47 +                                            <rect key="frame" x="14" y="29.5" width="290" height="16"/>
   63.48                                              <fontDescription key="fontDescription" type="system" pointSize="13"/>
   63.49                                              <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
   63.50                                              <nil key="highlightedColor"/>
   63.51 @@ -82,7 +82,7 @@
   63.52              <objects>
   63.53                  <viewController storyboardIdentifier="AddToContactsViewController" id="s44-OX-Z1E" userLabel="AddToContactsViewController" customClass="AddToContactsViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   63.54                      <view key="view" contentMode="scaleToFill" id="6XV-yY-DIJ">
   63.55 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
   63.56 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="524"/>
   63.57                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   63.58                          <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   63.59                          <viewLayoutGuide key="safeArea" id="exg-sf-cHu"/>
   63.60 @@ -106,11 +106,11 @@
   63.61              <objects>
   63.62                  <viewController storyboardIdentifier="KeySyncHandshakeViewController" id="GZS-2u-rXb" customClass="KeySyncHandshakeViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   63.63                      <view key="view" contentMode="scaleToFill" id="IdW-oi-ZvZ">
   63.64 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
   63.65 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   63.66                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   63.67                          <subviews>
   63.68                              <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fiE-pm-mWd" customClass="KeyInputView" customModule="pEpForiOS" customModuleProvider="target">
   63.69 -                                <rect key="frame" x="57.5" y="117" width="260" height="433.5"/>
   63.70 +                                <rect key="frame" x="30" y="67.5" width="260" height="433.5"/>
   63.71                                  <subviews>
   63.72                                      <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="YMa-Kc-JoR">
   63.73                                          <rect key="frame" x="0.0" y="10" width="260" height="423.5"/>
   63.74 @@ -294,11 +294,11 @@
   63.75              <objects>
   63.76                  <viewController storyboardIdentifier="PEPAlertViewController" id="SRk-tz-hg8" customClass="PEPAlertViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   63.77                      <view key="view" contentMode="scaleToFill" id="gej-yb-5Yw">
   63.78 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
   63.79 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   63.80                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   63.81                          <subviews>
   63.82                              <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cFd-dO-xyH" customClass="KeyInputView" customModule="pEpForiOS" customModuleProvider="target">
   63.83 -                                <rect key="frame" x="57.5" y="195.5" width="260" height="276"/>
   63.84 +                                <rect key="frame" x="30" y="146" width="260" height="276"/>
   63.85                                  <subviews>
   63.86                                      <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="USV-ch-gmd">
   63.87                                          <rect key="frame" x="0.0" y="10" width="260" height="266"/>
   63.88 @@ -418,11 +418,11 @@
   63.89              <objects>
   63.90                  <viewController storyboardIdentifier="TutorialViewController" id="pFx-V1-QWB" customClass="TutorialViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   63.91                      <view key="view" contentMode="scaleToFill" id="uqj-So-53r">
   63.92 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
   63.93 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   63.94                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   63.95                          <subviews>
   63.96                              <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DB7-wH-f0P">
   63.97 -                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
   63.98 +                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
   63.99                              </imageView>
  63.100                          </subviews>
  63.101                          <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  63.102 @@ -442,12 +442,218 @@
  63.103              </objects>
  63.104              <point key="canvasLocation" x="588" y="356.67166416791605"/>
  63.105          </scene>
  63.106 +        <!--Tutorial Step2 View Controller-->
  63.107 +        <scene sceneID="LGg-SX-HlR">
  63.108 +            <objects>
  63.109 +                <viewController storyboardIdentifier="TutorialStep2ViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="aQB-lg-HMZ" customClass="TutorialStep2ViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  63.110 +                    <view key="view" contentMode="scaleToFill" id="eKo-cf-vy7">
  63.111 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
  63.112 +                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  63.113 +                        <subviews>
  63.114 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Handshake" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E4b-mc-IYT">
  63.115 +                                <rect key="frame" x="117" y="30" width="86" height="21"/>
  63.116 +                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
  63.117 +                                <nil key="textColor"/>
  63.118 +                                <nil key="highlightedColor"/>
  63.119 +                            </label>
  63.120 +                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FF7-yG-JGd">
  63.121 +                                <rect key="frame" x="20" y="61" width="280" height="363.5"/>
  63.122 +                                <subviews>
  63.123 +                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jbi-yG-9Il">
  63.124 +                                        <rect key="frame" x="0.0" y="0.0" width="280" height="67"/>
  63.125 +                                        <edgeInsets key="layoutMargins" top="0.0" left="0.0" bottom="0.0" right="0.0"/>
  63.126 +                                        <string key="text">When you click on the Privacy Status icon in the top bar, you will get to the Handshake, where you can verify your communication partner. </string>
  63.127 +                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
  63.128 +                                        <nil key="textColor"/>
  63.129 +                                        <nil key="highlightedColor"/>
  63.130 +                                    </label>
  63.131 +                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UHI-c7-iQd" userLabel="Top Bar container">
  63.132 +                                        <rect key="frame" x="0.0" y="87" width="280" height="79.5"/>
  63.133 +                                        <subviews>
  63.134 +                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pEpForIOS-Asset-Tutorial-4" translatesAutoresizingMaskIntoConstraints="NO" id="L4I-np-79E" userLabel="Topbar Image View">
  63.135 +                                                <rect key="frame" x="0.0" y="0.0" width="280" height="79.5"/>
  63.136 +                                                <constraints>
  63.137 +                                                    <constraint firstAttribute="width" secondItem="L4I-np-79E" secondAttribute="height" multiplier="257:73" id="clU-MV-iHn"/>
  63.138 +                                                </constraints>
  63.139 +                                            </imageView>
  63.140 +                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Secure" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="orZ-GB-OGi">
  63.141 +                                                <rect key="frame" x="141" y="19.5" width="54" height="21"/>
  63.142 +                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
  63.143 +                                                <color key="textColor" systemColor="systemYellowColor" red="1" green="0.80000000000000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  63.144 +                                                <nil key="highlightedColor"/>
  63.145 +                                            </label>
  63.146 +                                        </subviews>
  63.147 +                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.148 +                                        <constraints>
  63.149 +                                            <constraint firstItem="L4I-np-79E" firstAttribute="leading" secondItem="UHI-c7-iQd" secondAttribute="leading" id="IhH-Nf-Eoh"/>
  63.150 +                                            <constraint firstItem="orZ-GB-OGi" firstAttribute="centerY" secondItem="L4I-np-79E" secondAttribute="centerY" multiplier="0.75" id="Jrd-CG-2Ot"/>
  63.151 +                                            <constraint firstItem="L4I-np-79E" firstAttribute="centerX" secondItem="UHI-c7-iQd" secondAttribute="centerX" id="OrF-7O-b8i"/>
  63.152 +                                            <constraint firstAttribute="bottom" secondItem="L4I-np-79E" secondAttribute="bottom" id="dLL-Hf-Szc"/>
  63.153 +                                            <constraint firstItem="orZ-GB-OGi" firstAttribute="centerX" secondItem="L4I-np-79E" secondAttribute="centerX" multiplier="1.2" id="iHi-K5-Pux"/>
  63.154 +                                            <constraint firstItem="L4I-np-79E" firstAttribute="top" secondItem="UHI-c7-iQd" secondAttribute="top" id="kwg-pT-aZa"/>
  63.155 +                                        </constraints>
  63.156 +                                    </view>
  63.157 +                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OBK-1J-dko" userLabel="Trustwords container">
  63.158 +                                        <rect key="frame" x="0.0" y="174.5" width="280" height="89"/>
  63.159 +                                        <subviews>
  63.160 +                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OUTDISTANCE   CORRINA   ETHIOPIA    OUTDRAW   FLEECER" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zd3-Y1-16M" userLabel="Triustwords Label">
  63.161 +                                                <rect key="frame" x="10" y="8" width="227.5" height="29"/>
  63.162 +                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
  63.163 +                                                <nil key="textColor"/>
  63.164 +                                                <nil key="highlightedColor"/>
  63.165 +                                            </label>
  63.166 +                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="SUa-gz-P97" userLabel="DeclineButton">
  63.167 +                                                <rect key="frame" x="10" y="45" width="46" height="28"/>
  63.168 +                                                <accessibility key="accessibilityConfiguration" label="wrongButton">
  63.169 +                                                    <accessibilityTraits key="traits" button="YES" notEnabled="YES"/>
  63.170 +                                                </accessibility>
  63.171 +                                                <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
  63.172 +                                                <state key="normal" title="Decline"/>
  63.173 +                                            </button>
  63.174 +                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="SR8-6c-hDL" userLabel="ConfirmButton">
  63.175 +                                                <rect key="frame" x="78" y="45" width="49" height="28"/>
  63.176 +                                                <accessibility key="accessibilityConfiguration" label="confirmButton">
  63.177 +                                                    <accessibilityTraits key="traits" button="YES" notEnabled="YES"/>
  63.178 +                                                </accessibility>
  63.179 +                                                <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
  63.180 +                                                <state key="normal" title="Confirm"/>
  63.181 +                                            </button>
  63.182 +                                        </subviews>
  63.183 +                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.184 +                                        <constraints>
  63.185 +                                            <constraint firstAttribute="height" constant="89" id="4wz-53-HYG"/>
  63.186 +                                            <constraint firstItem="SUa-gz-P97" firstAttribute="top" secondItem="zd3-Y1-16M" secondAttribute="bottom" constant="8" id="DLE-1e-Px3"/>
  63.187 +                                            <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="SUa-gz-P97" secondAttribute="bottom" constant="16" id="NCP-CE-cs7"/>
  63.188 +                                            <constraint firstItem="SUa-gz-P97" firstAttribute="leading" secondItem="zd3-Y1-16M" secondAttribute="leading" id="WGM-DP-nR7"/>
  63.189 +                                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="zd3-Y1-16M" secondAttribute="trailing" constant="-80.5" id="Wlf-pi-lnI">
  63.190 +                                                <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
  63.191 +                                            </constraint>
  63.192 +                                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="zd3-Y1-16M" secondAttribute="trailing" constant="10" id="ZL2-8t-qVq"/>
  63.193 +                                            <constraint firstItem="SR8-6c-hDL" firstAttribute="leading" secondItem="SUa-gz-P97" secondAttribute="trailing" priority="250" constant="22" id="ZwS-AE-dtp"/>
  63.194 +                                            <constraint firstItem="SUa-gz-P97" firstAttribute="centerY" secondItem="SR8-6c-hDL" secondAttribute="centerY" id="fXd-UD-faU"/>
  63.195 +                                            <constraint firstItem="zd3-Y1-16M" firstAttribute="leading" secondItem="OBK-1J-dko" secondAttribute="leading" constant="10" id="qia-tH-M5n"/>
  63.196 +                                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="SR8-6c-hDL" secondAttribute="trailing" constant="20" symbolic="YES" id="u63-ai-jA6"/>
  63.197 +                                            <constraint firstItem="zd3-Y1-16M" firstAttribute="top" secondItem="OBK-1J-dko" secondAttribute="top" constant="8" id="vkc-xi-lM8"/>
  63.198 +                                        </constraints>
  63.199 +                                        <userDefinedRuntimeAttributes>
  63.200 +                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
  63.201 +                                                <integer key="value" value="10"/>
  63.202 +                                            </userDefinedRuntimeAttribute>
  63.203 +                                            <userDefinedRuntimeAttribute type="color" keyPath="layer.borderColor">
  63.204 +                                                <color key="value" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  63.205 +                                            </userDefinedRuntimeAttribute>
  63.206 +                                            <userDefinedRuntimeAttribute type="boolean" keyPath="" value="YES"/>
  63.207 +                                        </userDefinedRuntimeAttributes>
  63.208 +                                        <variation key="default">
  63.209 +                                            <mask key="constraints">
  63.210 +                                                <exclude reference="4wz-53-HYG"/>
  63.211 +                                            </mask>
  63.212 +                                        </variation>
  63.213 +                                        <variation key="heightClass=regular-widthClass=compact">
  63.214 +                                            <mask key="constraints">
  63.215 +                                                <include reference="4wz-53-HYG"/>
  63.216 +                                                <exclude reference="ZL2-8t-qVq"/>
  63.217 +                                                <exclude reference="NCP-CE-cs7"/>
  63.218 +                                            </mask>
  63.219 +                                        </variation>
  63.220 +                                    </view>
  63.221 +                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7SL-dj-Z7j">
  63.222 +                                        <rect key="frame" x="0.0" y="283.5" width="280" height="72"/>
  63.223 +                                        <string key="text">When you confirm that the Trustwords of your communication partner are correct, your communication will be completely Secure &amp; Trusted. </string>
  63.224 +                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
  63.225 +                                        <nil key="textColor"/>
  63.226 +                                        <nil key="highlightedColor"/>
  63.227 +                                    </label>
  63.228 +                                </subviews>
  63.229 +                                <constraints>
  63.230 +                                    <constraint firstAttribute="trailing" secondItem="Jbi-yG-9Il" secondAttribute="trailing" id="05i-PT-sx4"/>
  63.231 +                                    <constraint firstItem="OBK-1J-dko" firstAttribute="trailing" secondItem="UHI-c7-iQd" secondAttribute="trailing" id="8iV-lf-vn7"/>
  63.232 +                                    <constraint firstItem="OBK-1J-dko" firstAttribute="leading" secondItem="UHI-c7-iQd" secondAttribute="leading" id="A13-8y-why"/>
  63.233 +                                    <constraint firstItem="7SL-dj-Z7j" firstAttribute="trailing" secondItem="Jbi-yG-9Il" secondAttribute="trailing" id="AL3-mw-jEb"/>
  63.234 +                                    <constraint firstItem="OBK-1J-dko" firstAttribute="top" secondItem="7SL-dj-Z7j" secondAttribute="top" id="BDe-zy-YhZ"/>
  63.235 +                                    <constraint firstItem="Jbi-yG-9Il" firstAttribute="top" secondItem="FF7-yG-JGd" secondAttribute="top" id="Dyj-h1-beH"/>
  63.236 +                                    <constraint firstItem="OBK-1J-dko" firstAttribute="trailing" secondItem="UHI-c7-iQd" secondAttribute="trailing" id="EGZ-lQ-bVe"/>
  63.237 +                                    <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="OBK-1J-dko" secondAttribute="bottom" id="FVG-1y-16M"/>
  63.238 +                                    <constraint firstItem="Jbi-yG-9Il" firstAttribute="bottom" secondItem="UHI-c7-iQd" secondAttribute="top" constant="-20" id="Fx7-6e-gve"/>
  63.239 +                                    <constraint firstItem="UHI-c7-iQd" firstAttribute="leading" secondItem="FF7-yG-JGd" secondAttribute="leading" id="FxZ-4c-Jx2"/>
  63.240 +                                    <constraint firstAttribute="bottom" secondItem="7SL-dj-Z7j" secondAttribute="bottom" priority="250" constant="8" id="GS8-Bp-5Qn"/>
  63.241 +                                    <constraint firstItem="OBK-1J-dko" firstAttribute="top" secondItem="L4I-np-79E" secondAttribute="bottom" constant="8" id="JVS-9y-Fkg"/>
  63.242 +                                    <constraint firstItem="UHI-c7-iQd" firstAttribute="top" secondItem="Jbi-yG-9Il" secondAttribute="top" id="Nbz-tu-Zyg"/>
  63.243 +                                    <constraint firstAttribute="trailing" secondItem="UHI-c7-iQd" secondAttribute="trailing" id="Rtm-rl-szO"/>
  63.244 +                                    <constraint firstItem="7SL-dj-Z7j" firstAttribute="leading" secondItem="Jbi-yG-9Il" secondAttribute="leading" id="Y7A-PG-9Ca"/>
  63.245 +                                    <constraint firstAttribute="trailing" secondItem="Jbi-yG-9Il" secondAttribute="trailing" id="cz0-YS-ZOr"/>
  63.246 +                                    <constraint firstItem="7SL-dj-Z7j" firstAttribute="top" secondItem="Jbi-yG-9Il" secondAttribute="bottom" priority="250" constant="30" id="edC-vd-nvh">
  63.247 +                                        <variation key="heightClass=regular-widthClass=compact" constant="200"/>
  63.248 +                                    </constraint>
  63.249 +                                    <constraint firstAttribute="centerX" secondItem="Jbi-yG-9Il" secondAttribute="trailing" id="ge3-8c-xui"/>
  63.250 +                                    <constraint firstItem="UHI-c7-iQd" firstAttribute="leading" secondItem="Jbi-yG-9Il" secondAttribute="trailing" constant="10" id="oRZ-bW-jod"/>
  63.251 +                                    <constraint firstItem="7SL-dj-Z7j" firstAttribute="top" secondItem="OBK-1J-dko" secondAttribute="bottom" constant="20" id="sZn-pK-Ofs"/>
  63.252 +                                    <constraint firstItem="Jbi-yG-9Il" firstAttribute="leading" secondItem="FF7-yG-JGd" secondAttribute="leading" id="vhW-nn-jGW"/>
  63.253 +                                    <constraint firstItem="OBK-1J-dko" firstAttribute="leading" secondItem="UHI-c7-iQd" secondAttribute="leading" id="vrP-7O-ceL"/>
  63.254 +                                </constraints>
  63.255 +                                <variation key="default">
  63.256 +                                    <mask key="constraints">
  63.257 +                                        <exclude reference="05i-PT-sx4"/>
  63.258 +                                        <exclude reference="Fx7-6e-gve"/>
  63.259 +                                        <exclude reference="cz0-YS-ZOr"/>
  63.260 +                                        <exclude reference="FxZ-4c-Jx2"/>
  63.261 +                                        <exclude reference="8iV-lf-vn7"/>
  63.262 +                                        <exclude reference="A13-8y-why"/>
  63.263 +                                        <exclude reference="sZn-pK-Ofs"/>
  63.264 +                                    </mask>
  63.265 +                                </variation>
  63.266 +                                <variation key="heightClass=regular-widthClass=compact">
  63.267 +                                    <mask key="constraints">
  63.268 +                                        <exclude reference="05i-PT-sx4"/>
  63.269 +                                        <include reference="Fx7-6e-gve"/>
  63.270 +                                        <include reference="cz0-YS-ZOr"/>
  63.271 +                                        <exclude reference="ge3-8c-xui"/>
  63.272 +                                        <include reference="FxZ-4c-Jx2"/>
  63.273 +                                        <exclude reference="Nbz-tu-Zyg"/>
  63.274 +                                        <exclude reference="oRZ-bW-jod"/>
  63.275 +                                        <include reference="8iV-lf-vn7"/>
  63.276 +                                        <include reference="A13-8y-why"/>
  63.277 +                                        <exclude reference="BDe-zy-YhZ"/>
  63.278 +                                        <exclude reference="EGZ-lQ-bVe"/>
  63.279 +                                        <exclude reference="FVG-1y-16M"/>
  63.280 +                                        <exclude reference="vrP-7O-ceL"/>
  63.281 +                                        <include reference="sZn-pK-Ofs"/>
  63.282 +                                    </mask>
  63.283 +                                </variation>
  63.284 +                            </view>
  63.285 +                        </subviews>
  63.286 +                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.287 +                        <constraints>
  63.288 +                            <constraint firstItem="wFE-fi-182" firstAttribute="trailing" secondItem="FF7-yG-JGd" secondAttribute="trailing" constant="20" id="MBA-xv-9ap"/>
  63.289 +                            <constraint firstItem="E4b-mc-IYT" firstAttribute="centerX" secondItem="wFE-fi-182" secondAttribute="centerX" id="YlP-NX-e0l"/>
  63.290 +                            <constraint firstItem="E4b-mc-IYT" firstAttribute="top" secondItem="wFE-fi-182" secondAttribute="top" constant="30" id="Z7M-zJ-7EI">
  63.291 +                                <variation key="heightClass=compact-widthClass=compact" constant="10"/>
  63.292 +                            </constraint>
  63.293 +                            <constraint firstItem="FF7-yG-JGd" firstAttribute="leading" secondItem="wFE-fi-182" secondAttribute="leading" constant="20" id="bP7-Bm-hd2"/>
  63.294 +                            <constraint firstItem="FF7-yG-JGd" firstAttribute="top" secondItem="E4b-mc-IYT" secondAttribute="bottom" constant="10" id="dIZ-gk-phn"/>
  63.295 +                            <constraint firstItem="FF7-yG-JGd" firstAttribute="centerX" secondItem="wFE-fi-182" secondAttribute="centerX" id="ixT-xy-a6p"/>
  63.296 +                        </constraints>
  63.297 +                        <viewLayoutGuide key="safeArea" id="wFE-fi-182"/>
  63.298 +                    </view>
  63.299 +                    <connections>
  63.300 +                        <outlet property="confirmButton" destination="SR8-6c-hDL" id="u7O-dv-tbW"/>
  63.301 +                        <outlet property="confirmTrustwordsExplanationLabel" destination="7SL-dj-Z7j" id="p1t-DN-ypf"/>
  63.302 +                        <outlet property="declineButton" destination="SUa-gz-P97" id="83W-61-Jlj"/>
  63.303 +                        <outlet property="handshakeTitle" destination="E4b-mc-IYT" id="pqA-6m-TJZ"/>
  63.304 +                        <outlet property="privacyStatusExplanationLabel" destination="Jbi-yG-9Il" id="7sY-5k-j2O"/>
  63.305 +                        <outlet property="trustwordsContainer" destination="OBK-1J-dko" id="3ZE-hJ-EjV"/>
  63.306 +                    </connections>
  63.307 +                </viewController>
  63.308 +                <placeholder placeholderIdentifier="IBFirstResponder" id="Vno-HE-Guc" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  63.309 +            </objects>
  63.310 +            <point key="canvasLocation" x="357.04225352112678" y="1365"/>
  63.311 +        </scene>
  63.312          <!--Key Sync Wizard View Controller-->
  63.313          <scene sceneID="3xa-QV-des">
  63.314              <objects>
  63.315                  <viewController storyboardIdentifier="KeySyncWizardViewController" id="a2x-6p-i9y" customClass="KeySyncWizardViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  63.316                      <view key="view" contentMode="scaleToFill" id="88d-5G-bdY">
  63.317 -                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
  63.318 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
  63.319                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  63.320                          <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.321                          <viewLayoutGuide key="safeArea" id="iQt-NK-qAI"/>
  63.322 @@ -457,8 +663,561 @@
  63.323              </objects>
  63.324              <point key="canvasLocation" x="1309" y="357"/>
  63.325          </scene>
  63.326 +        <!--Tutorial Step0 View Controller-->
  63.327 +        <scene sceneID="rRy-7k-m6w">
  63.328 +            <objects>
  63.329 +                <viewController storyboardIdentifier="TutorialStep0ViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="wF7-yD-79T" customClass="TutorialStep0ViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  63.330 +                    <view key="view" contentMode="scaleToFill" id="XRf-tg-p6f">
  63.331 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
  63.332 +                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  63.333 +                        <subviews>
  63.334 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Welcome to the p≡p Tutorial" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ynz-KT-KJl">
  63.335 +                                <rect key="frame" x="76.5" y="20" width="167" height="57.5"/>
  63.336 +                                <fontDescription key="fontDescription" type="system" pointSize="24"/>
  63.337 +                                <nil key="textColor"/>
  63.338 +                                <nil key="highlightedColor"/>
  63.339 +                            </label>
  63.340 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You can close this tutorial anytime with the Skip button." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B2w-Dk-0sO">
  63.341 +                                <rect key="frame" x="48" y="95.5" width="224" height="31.5"/>
  63.342 +                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
  63.343 +                                <nil key="textColor"/>
  63.344 +                                <nil key="highlightedColor"/>
  63.345 +                            </label>
  63.346 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="p≡p uses a Privacy Status icon to indicate how secure your communication is" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6p7-rU-UIJ">
  63.347 +                                <rect key="frame" x="32" y="139" width="256" height="31.5"/>
  63.348 +                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
  63.349 +                                <nil key="textColor"/>
  63.350 +                                <nil key="highlightedColor"/>
  63.351 +                            </label>
  63.352 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" text="This Privacy Status Icon is shown as an Icon the user's avatar" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9zn-gN-7aV">
  63.353 +                                <rect key="frame" x="48" y="182.5" width="224" height="31.5"/>
  63.354 +                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
  63.355 +                                <nil key="textColor"/>
  63.356 +                                <nil key="highlightedColor"/>
  63.357 +                            </label>
  63.358 +                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pEpForIOS-Asset-Tutorial-1a" translatesAutoresizingMaskIntoConstraints="NO" id="5GU-20-NSg" userLabel="Contact Placeholder">
  63.359 +                                <rect key="frame" x="450.5" y="105" width="58" height="58"/>
  63.360 +                            </imageView>
  63.361 +                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="And in the top bar when you open or write an email:" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="26J-Qa-GAl">
  63.362 +                                <rect key="frame" x="40" y="294" width="240" height="31.5"/>
  63.363 +                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
  63.364 +                                <nil key="textColor"/>
  63.365 +                                <nil key="highlightedColor"/>
  63.366 +                            </label>
  63.367 +                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pEpForIOS-Asset-Tutorial-1b" translatesAutoresizingMaskIntoConstraints="NO" id="P9a-4R-73k" userLabel="Topbar Image View">
  63.368 +                                <rect key="frame" x="8" y="345.5" width="304" height="53.5"/>
  63.369 +                                <constraints>
  63.370 +                                    <constraint firstAttribute="height" constant="59" id="eI7-OQ-eMt"/>
  63.371 +                                    <constraint firstAttribute="width" priority="250" constant="334" id="pfl-8K-3WN"/>
  63.372 +                                    <constraint firstAttribute="width" secondItem="P9a-4R-73k" secondAttribute="height" multiplier="334:59" id="v46-x0-1H3"/>
  63.373 +                                </constraints>
  63.374 +                                <variation key="default">
  63.375 +                                    <mask key="constraints">
  63.376 +                                        <exclude reference="eI7-OQ-eMt"/>
  63.377 +                                        <exclude reference="pfl-8K-3WN"/>
  63.378 +                                    </mask>
  63.379 +                                </variation>
  63.380 +                                <variation key="heightClass=compact-widthClass=compact">
  63.381 +                                    <mask key="constraints">
  63.382 +                                        <include reference="eI7-OQ-eMt"/>
  63.383 +                                    </mask>
  63.384 +                                </variation>
  63.385 +                                <variation key="heightClass=compact-widthClass=regular">
  63.386 +                                    <mask key="constraints">
  63.387 +                                        <include reference="eI7-OQ-eMt"/>
  63.388 +                                        <include reference="pfl-8K-3WN"/>
  63.389 +                                    </mask>
  63.390 +                                </variation>
  63.391 +                                <variation key="heightClass=regular-widthClass=compact">
  63.392 +                                    <mask key="constraints">
  63.393 +                                        <include reference="pfl-8K-3WN"/>
  63.394 +                                    </mask>
  63.395 +                                </variation>
  63.396 +                            </imageView>
  63.397 +                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" image="pEp-status-msg-yellow" translatesAutoresizingMaskIntoConstraints="NO" id="Hby-kf-CrJ" userLabel="Privacy Status Image View">
  63.398 +                                <rect key="frame" x="132.5" y="369" width="55" height="19"/>
  63.399 +                                <constraints>
  63.400 +                                    <constraint firstAttribute="width" secondItem="Hby-kf-CrJ" secondAttribute="height" multiplier="20:7" id="8it-du-Psf"/>
  63.401 +                                </constraints>
  63.402 +                            </imageView>
  63.403 +                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pEpForIOS-Asset-Tutorial-1a" translatesAutoresizingMaskIntoConstraints="NO" id="NB4-ZU-NhP" userLabel="Avatar Image View">
  63.404 +                                <rect key="frame" x="131" y="226" width="58" height="58"/>
  63.405 +                                <constraints>
  63.406 +                                    <constraint firstAttribute="width" secondItem="NB4-ZU-NhP" secondAttribute="height" multiplier="1:1" id="RKe-Y1-5k5"/>
  63.407 +                                </constraints>
  63.408 +                            </imageView>
  63.409 +                        </subviews>
  63.410 +                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.411 +                        <constraints>
  63.412 +                            <constraint firstItem="6p7-rU-UIJ" firstAttribute="width" secondItem="XRf-tg-p6f" secondAttribute="width" multiplier="0.8" id="0zh-At-nmY"/>
  63.413 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="top" secondItem="ynz-KT-KJl" secondAttribute="bottom" constant="46" id="1Yi-sE-hzb">
  63.414 +                                <variation key="heightClass=compact-widthClass=compact" constant="8"/>
  63.415 +                                <variation key="heightClass=compact-widthClass=regular" constant="20"/>
  63.416 +                                <variation key="heightClass=regular-widthClass=compact" constant="18"/>
  63.417 +                            </constraint>
  63.418 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="P9a-4R-73k" secondAttribute="bottom" priority="249" constant="8" id="2NX-XQ-frw"/>
  63.419 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="leading" secondItem="B2w-Dk-0sO" secondAttribute="leading" id="2c4-tU-C4j"/>
  63.420 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6p7-rU-UIJ" secondAttribute="trailing" constant="80" id="3m0-VN-glA">
  63.421 +                                <variation key="heightClass=compact-widthClass=compact" constant="8"/>
  63.422 +                                <variation key="heightClass=regular-widthClass=regular" constant="8"/>
  63.423 +                            </constraint>
  63.424 +                            <constraint firstItem="9zn-gN-7aV" firstAttribute="leading" secondItem="B2w-Dk-0sO" secondAttribute="leading" id="6FX-0z-0wY"/>
  63.425 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="9zn-gN-7aV" secondAttribute="trailing" symbolic="YES" id="6Lo-lN-MF0"/>
  63.426 +                            <constraint firstItem="6p7-rU-UIJ" firstAttribute="top" secondItem="B2w-Dk-0sO" secondAttribute="bottom" constant="19" id="6sQ-2O-oI5">
  63.427 +                                <variation key="heightClass=compact-widthClass=compact" constant="12"/>
  63.428 +                                <variation key="heightClass=compact-widthClass=regular" constant="15"/>
  63.429 +                                <variation key="heightClass=regular-widthClass=compact" constant="12"/>
  63.430 +                                <variation key="heightClass=regular-widthClass=regular" constant="25"/>
  63.431 +                            </constraint>
  63.432 +                            <constraint firstItem="9zn-gN-7aV" firstAttribute="top" secondItem="6p7-rU-UIJ" secondAttribute="bottom" constant="15" id="6yI-Cc-BJb">
  63.433 +                                <variation key="heightClass=compact-widthClass=compact" constant="12"/>
  63.434 +                                <variation key="heightClass=compact-widthClass=regular" constant="15"/>
  63.435 +                                <variation key="heightClass=regular-widthClass=compact" constant="12"/>
  63.436 +                                <variation key="heightClass=regular-widthClass=regular" constant="25"/>
  63.437 +                            </constraint>
  63.438 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="centerX" secondItem="ynz-KT-KJl" secondAttribute="centerX" id="708-0N-Er6"/>
  63.439 +                            <constraint firstItem="Hby-kf-CrJ" firstAttribute="width" secondItem="P9a-4R-73k" secondAttribute="height" multiplier="60:59" id="736-uk-ad0"/>
  63.440 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="B2w-Dk-0sO" secondAttribute="trailing" constant="8" id="8zL-kn-hJv"/>
  63.441 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="top" secondItem="9zn-gN-7aV" secondAttribute="bottom" constant="100" id="9zn-5L-zyu">
  63.442 +                                <variation key="heightClass=compact-widthClass=compact" constant="12"/>
  63.443 +                                <variation key="heightClass=compact-widthClass=regular" constant="15"/>
  63.444 +                                <variation key="heightClass=regular-widthClass=compact" constant="80"/>
  63.445 +                                <variation key="heightClass=regular-widthClass=regular" constant="25"/>
  63.446 +                            </constraint>
  63.447 +                            <constraint firstItem="6p7-rU-UIJ" firstAttribute="centerX" secondItem="B2w-Dk-0sO" secondAttribute="centerX" id="ABZ-an-fz5"/>
  63.448 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="B2w-Dk-0sO" secondAttribute="trailing" symbolic="YES" id="CeU-fn-1CE"/>
  63.449 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="leading" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="92" id="DYx-Ba-FRn"/>
  63.450 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="centerX" secondItem="ynz-KT-KJl" secondAttribute="centerX" id="EcW-Pa-RUy"/>
  63.451 +                            <constraint firstItem="Hby-kf-CrJ" firstAttribute="centerX" secondItem="P9a-4R-73k" secondAttribute="centerX" id="Gox-VN-vqX"/>
  63.452 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="centerX" secondItem="ynz-KT-KJl" secondAttribute="centerX" id="KlA-gU-SXu"/>
  63.453 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="8" id="MCC-dI-kFd"/>
  63.454 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="8" id="P56-rh-cxw"/>
  63.455 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="B2w-Dk-0sO" secondAttribute="trailing" constant="80" id="PxY-bj-HW1"/>
  63.456 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="leading" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="40" id="RIs-Sh-mwP"/>
  63.457 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="26J-Qa-GAl" secondAttribute="trailing" constant="8" id="Sik-ba-wrv"/>
  63.458 +                            <constraint firstItem="ynz-KT-KJl" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="50" id="Tgu-8q-rpt"/>
  63.459 +                            <constraint firstItem="NB4-ZU-NhP" firstAttribute="top" secondItem="9zn-gN-7aV" secondAttribute="bottom" constant="15.5" id="Ts5-Mn-9Re">
  63.460 +                                <variation key="heightClass=regular-widthClass=compact" constant="12"/>
  63.461 +                            </constraint>
  63.462 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="leading" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="125" id="TxF-PG-8XV">
  63.463 +                                <variation key="heightClass=compact-widthClass=compact" constant="50"/>
  63.464 +                                <variation key="heightClass=regular-widthClass=compact" constant="50"/>
  63.465 +                                <variation key="heightClass=regular-widthClass=regular" constant="50"/>
  63.466 +                            </constraint>
  63.467 +                            <constraint firstItem="ynz-KT-KJl" firstAttribute="top" secondItem="IRx-BF-Xw1" secondAttribute="top" constant="35" id="UPw-as-sKW">
  63.468 +                                <variation key="heightClass=compact-widthClass=compact" constant="12"/>
  63.469 +                                <variation key="heightClass=compact-widthClass=regular" constant="20"/>
  63.470 +                                <variation key="heightClass=regular-widthClass=compact" constant="20"/>
  63.471 +                                <variation key="heightClass=regular-widthClass=regular" constant="50"/>
  63.472 +                            </constraint>
  63.473 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="bottom" secondItem="P9a-4R-73k" secondAttribute="top" constant="-40" id="XOm-lu-wC3"/>
  63.474 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="leading" secondItem="9zn-gN-7aV" secondAttribute="leading" id="b6g-ey-x8I"/>
  63.475 +                            <constraint firstItem="Hby-kf-CrJ" firstAttribute="centerY" secondItem="P9a-4R-73k" secondAttribute="centerY" constant="6" id="cRL-cv-hCo"/>
  63.476 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="top" secondItem="26J-Qa-GAl" secondAttribute="bottom" constant="16" id="cu0-EJ-R08"/>
  63.477 +                            <constraint firstItem="9zn-gN-7aV" firstAttribute="centerX" secondItem="6p7-rU-UIJ" secondAttribute="centerX" id="cxE-k6-Gd0"/>
  63.478 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="leading" secondItem="9zn-gN-7aV" secondAttribute="leading" id="foZ-io-sJe"/>
  63.479 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="trailing" secondItem="IRx-BF-Xw1" secondAttribute="trailing" constant="-8" id="g3m-Mp-j72"/>
  63.480 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6p7-rU-UIJ" secondAttribute="trailing" symbolic="YES" id="g9N-Yy-QiX"/>
  63.481 +                            <constraint firstItem="9zn-gN-7aV" firstAttribute="centerX" secondItem="6p7-rU-UIJ" secondAttribute="centerX" id="hbD-2r-UDT"/>
  63.482 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="top" secondItem="NB4-ZU-NhP" secondAttribute="bottom" priority="250" constant="26.5" id="hxA-6n-ajo"/>
  63.483 +                            <constraint firstItem="5GU-20-NSg" firstAttribute="leading" secondItem="9zn-gN-7aV" secondAttribute="trailing" constant="30" id="i1V-Rw-mpN">
  63.484 +                                <variation key="heightClass=regular-widthClass=regular" constant="40"/>
  63.485 +                            </constraint>
  63.486 +                            <constraint firstItem="5GU-20-NSg" firstAttribute="top" secondItem="9zn-gN-7aV" secondAttribute="top" id="iB8-Du-mIA"/>
  63.487 +                            <constraint firstItem="ynz-KT-KJl" firstAttribute="centerX" secondItem="IRx-BF-Xw1" secondAttribute="centerX" id="jGY-ws-lAd"/>
  63.488 +                            <constraint firstItem="ynz-KT-KJl" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="50" id="k5O-4W-nBs"/>
  63.489 +                            <constraint firstItem="6p7-rU-UIJ" firstAttribute="leading" secondItem="B2w-Dk-0sO" secondAttribute="leading" id="qJ6-Q2-ij9"/>
  63.490 +                            <constraint firstItem="9zn-gN-7aV" firstAttribute="leading" secondItem="6p7-rU-UIJ" secondAttribute="leading" id="rrc-BP-nfQ"/>
  63.491 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="leading" secondItem="IRx-BF-Xw1" secondAttribute="leading" constant="80" id="s6L-dq-WqX"/>
  63.492 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="top" secondItem="26J-Qa-GAl" secondAttribute="bottom" priority="250" constant="20" id="uMP-kD-xUc">
  63.493 +                                <variation key="heightClass=compact-widthClass=compact" constant="14"/>
  63.494 +                            </constraint>
  63.495 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="leading" secondItem="26J-Qa-GAl" secondAttribute="leading" id="v1W-kn-t6D"/>
  63.496 +                            <constraint firstItem="9zn-gN-7aV" firstAttribute="leading" secondItem="6p7-rU-UIJ" secondAttribute="leading" id="vF2-n4-2b6"/>
  63.497 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="leading" secondItem="26J-Qa-GAl" secondAttribute="leading" id="wHO-mi-PZg"/>
  63.498 +                            <constraint firstItem="P9a-4R-73k" firstAttribute="centerX" secondItem="IRx-BF-Xw1" secondAttribute="centerX" id="wfr-ue-0OH"/>
  63.499 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5GU-20-NSg" secondAttribute="trailing" constant="50" id="wi8-nd-cvf"/>
  63.500 +                            <constraint firstItem="26J-Qa-GAl" firstAttribute="leading" secondItem="9zn-gN-7aV" secondAttribute="leading" id="xM9-Yp-aIb"/>
  63.501 +                            <constraint firstItem="NB4-ZU-NhP" firstAttribute="centerX" secondItem="9zn-gN-7aV" secondAttribute="centerX" id="xuT-AD-naW"/>
  63.502 +                            <constraint firstItem="IRx-BF-Xw1" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ynz-KT-KJl" secondAttribute="trailing" constant="50" id="zjz-re-gi9"/>
  63.503 +                            <constraint firstItem="B2w-Dk-0sO" firstAttribute="width" secondItem="XRf-tg-p6f" secondAttribute="width" multiplier="0.7" id="zke-Yl-Zri"/>
  63.504 +                        </constraints>
  63.505 +                        <viewLayoutGuide key="safeArea" id="IRx-BF-Xw1"/>
  63.506 +                        <variation key="default">
  63.507 +                            <mask key="subviews">
  63.508 +                                <exclude reference="5GU-20-NSg"/>
  63.509 +                            </mask>
  63.510 +                            <mask key="constraints">
  63.511 +                                <exclude reference="3m0-VN-glA"/>
  63.512 +                                <exclude reference="8zL-kn-hJv"/>
  63.513 +                                <exclude reference="PxY-bj-HW1"/>
  63.514 +                                <exclude reference="Tgu-8q-rpt"/>
  63.515 +                                <exclude reference="DYx-Ba-FRn"/>
  63.516 +                                <exclude reference="KlA-gU-SXu"/>
  63.517 +                                <exclude reference="TxF-PG-8XV"/>
  63.518 +                                <exclude reference="s6L-dq-WqX"/>
  63.519 +                                <exclude reference="qJ6-Q2-ij9"/>
  63.520 +                                <exclude reference="rrc-BP-nfQ"/>
  63.521 +                                <exclude reference="vF2-n4-2b6"/>
  63.522 +                                <exclude reference="RIs-Sh-mwP"/>
  63.523 +                                <exclude reference="XOm-lu-wC3"/>
  63.524 +                                <exclude reference="b6g-ey-x8I"/>
  63.525 +                                <exclude reference="foZ-io-sJe"/>
  63.526 +                                <exclude reference="xM9-Yp-aIb"/>
  63.527 +                                <exclude reference="2c4-tU-C4j"/>
  63.528 +                                <exclude reference="cu0-EJ-R08"/>
  63.529 +                                <exclude reference="uMP-kD-xUc"/>
  63.530 +                                <exclude reference="v1W-kn-t6D"/>
  63.531 +                                <exclude reference="wHO-mi-PZg"/>
  63.532 +                            </mask>
  63.533 +                        </variation>
  63.534 +                        <variation key="heightClass=compact-widthClass=compact">
  63.535 +                            <mask key="subviews">
  63.536 +                                <include reference="5GU-20-NSg"/>
  63.537 +                                <exclude reference="NB4-ZU-NhP"/>
  63.538 +                            </mask>
  63.539 +                            <mask key="constraints">
  63.540 +                                <include reference="3m0-VN-glA"/>
  63.541 +                                <include reference="8zL-kn-hJv"/>
  63.542 +                                <include reference="Tgu-8q-rpt"/>
  63.543 +                                <exclude reference="EcW-Pa-RUy"/>
  63.544 +                                <exclude reference="P56-rh-cxw"/>
  63.545 +                                <include reference="TxF-PG-8XV"/>
  63.546 +                                <exclude reference="zke-Yl-Zri"/>
  63.547 +                                <exclude reference="0zh-At-nmY"/>
  63.548 +                                <exclude reference="ABZ-an-fz5"/>
  63.549 +                                <exclude reference="cxE-k6-Gd0"/>
  63.550 +                                <exclude reference="hbD-2r-UDT"/>
  63.551 +                                <include reference="vF2-n4-2b6"/>
  63.552 +                                <exclude reference="708-0N-Er6"/>
  63.553 +                                <include reference="foZ-io-sJe"/>
  63.554 +                                <include reference="xM9-Yp-aIb"/>
  63.555 +                                <include reference="2c4-tU-C4j"/>
  63.556 +                                <exclude reference="MCC-dI-kFd"/>
  63.557 +                                <exclude reference="g3m-Mp-j72"/>
  63.558 +                                <include reference="uMP-kD-xUc"/>
  63.559 +                                <exclude reference="wfr-ue-0OH"/>
  63.560 +                                <exclude reference="736-uk-ad0"/>
  63.561 +                            </mask>
  63.562 +                        </variation>
  63.563 +                        <variation key="heightClass=compact-widthClass=regular">
  63.564 +                            <mask key="subviews">
  63.565 +                                <include reference="5GU-20-NSg"/>
  63.566 +                                <exclude reference="NB4-ZU-NhP"/>
  63.567 +                            </mask>
  63.568 +                            <mask key="constraints">
  63.569 +                                <exclude reference="2NX-XQ-frw"/>
  63.570 +                                <include reference="DYx-Ba-FRn"/>
  63.571 +                                <exclude reference="EcW-Pa-RUy"/>
  63.572 +                                <exclude reference="P56-rh-cxw"/>
  63.573 +                                <exclude reference="zke-Yl-Zri"/>
  63.574 +                                <exclude reference="0zh-At-nmY"/>
  63.575 +                                <exclude reference="ABZ-an-fz5"/>
  63.576 +                                <include reference="qJ6-Q2-ij9"/>
  63.577 +                                <exclude reference="cxE-k6-Gd0"/>
  63.578 +                                <exclude reference="hbD-2r-UDT"/>
  63.579 +                                <include reference="rrc-BP-nfQ"/>
  63.580 +                                <exclude reference="708-0N-Er6"/>
  63.581 +                                <include reference="b6g-ey-x8I"/>
  63.582 +                                <exclude reference="MCC-dI-kFd"/>
  63.583 +                                <include reference="cu0-EJ-R08"/>
  63.584 +                                <exclude reference="g3m-Mp-j72"/>
  63.585 +                                <include reference="v1W-kn-t6D"/>
  63.586 +                                <exclude reference="wfr-ue-0OH"/>
  63.587 +                            </mask>
  63.588 +                        </variation>
  63.589 +                        <variation key="heightClass=regular-widthClass=compact">
  63.590 +                            <mask key="subviews">
  63.591 +                                <exclude reference="5GU-20-NSg"/>
  63.592 +                            </mask>
  63.593 +                            <mask key="constraints">
  63.594 +                                <exclude reference="zjz-re-gi9"/>
  63.595 +                                <exclude reference="Tgu-8q-rpt"/>
  63.596 +                                <exclude reference="EcW-Pa-RUy"/>
  63.597 +                                <include reference="KlA-gU-SXu"/>
  63.598 +                                <exclude reference="P56-rh-cxw"/>
  63.599 +                                <exclude reference="TxF-PG-8XV"/>
  63.600 +                                <exclude reference="cxE-k6-Gd0"/>
  63.601 +                                <include reference="RIs-Sh-mwP"/>
  63.602 +                                <exclude reference="g3m-Mp-j72"/>
  63.603 +                                <include reference="uMP-kD-xUc"/>
  63.604 +                            </mask>
  63.605 +                        </variation>
  63.606 +                        <variation key="heightClass=regular-widthClass=regular">
  63.607 +                            <mask key="subviews">
  63.608 +                                <include reference="5GU-20-NSg"/>
  63.609 +                                <exclude reference="NB4-ZU-NhP"/>
  63.610 +                            </mask>
  63.611 +                            <mask key="constraints">
  63.612 +                                <exclude reference="2NX-XQ-frw"/>
  63.613 +                                <include reference="3m0-VN-glA"/>
  63.614 +                                <include reference="8zL-kn-hJv"/>
  63.615 +                                <include reference="PxY-bj-HW1"/>
  63.616 +                                <include reference="Tgu-8q-rpt"/>
  63.617 +                                <exclude reference="EcW-Pa-RUy"/>
  63.618 +                                <exclude reference="KlA-gU-SXu"/>
  63.619 +                                <exclude reference="P56-rh-cxw"/>
  63.620 +                                <exclude reference="TxF-PG-8XV"/>
  63.621 +                                <include reference="s6L-dq-WqX"/>
  63.622 +                                <exclude reference="zke-Yl-Zri"/>
  63.623 +                                <exclude reference="0zh-At-nmY"/>
  63.624 +                                <exclude reference="ABZ-an-fz5"/>
  63.625 +                                <exclude reference="cxE-k6-Gd0"/>
  63.626 +                                <exclude reference="hbD-2r-UDT"/>
  63.627 +                                <include reference="vF2-n4-2b6"/>
  63.628 +                                <exclude reference="708-0N-Er6"/>
  63.629 +                                <include reference="XOm-lu-wC3"/>
  63.630 +                                <include reference="foZ-io-sJe"/>
  63.631 +                                <exclude reference="g3m-Mp-j72"/>
  63.632 +                                <include reference="wHO-mi-PZg"/>
  63.633 +                                <exclude reference="wfr-ue-0OH"/>
  63.634 +                            </mask>
  63.635 +                        </variation>
  63.636 +                    </view>
  63.637 +                    <connections>
  63.638 +                        <outlet property="avatarImageView" destination="NB4-ZU-NhP" id="bhX-eG-lJ6"/>
  63.639 +                        <outlet property="distanceBetweenAvatarAndPrivacyStatus2LabelConstraint" destination="Ts5-Mn-9Re" id="FAo-Eh-ETb"/>
  63.640 +                        <outlet property="distanceBetweenPrivacyStatusAndSkipConstraint" destination="6sQ-2O-oI5" id="wlO-Fy-1NQ"/>
  63.641 +                        <outlet property="distanceBetweenSkipAndTitleConstraint" destination="1Yi-sE-hzb" id="ENb-3f-2wI"/>
  63.642 +                        <outlet property="distanceBetweenTitleViewAndTopConstraint" destination="UPw-as-sKW" id="WtY-Cp-Eh6"/>
  63.643 +                        <outlet property="distanceBetweenTopbarImageAndBottomLabelConstraint" destination="uMP-kD-xUc" id="AVT-dn-wev"/>
  63.644 +                        <outlet property="distanceBetweenTopbarLabelAndPrivacyStatus2Constraint" destination="9zn-5L-zyu" id="WEh-o8-bb6"/>
  63.645 +                        <outlet property="privacyStatusLabel" destination="6p7-rU-UIJ" id="sfQ-NQ-O22"/>
  63.646 +                        <outlet property="privacyStatusShownLabel" destination="9zn-gN-7aV" id="neR-K1-rIp"/>
  63.647 +                        <outlet property="skipTutorialLabel" destination="B2w-Dk-0sO" id="xVr-X5-Z9y"/>
  63.648 +                        <outlet property="titleLabel" destination="ynz-KT-KJl" id="fVF-0v-Wi1"/>
  63.649 +                        <outlet property="titleLabelLeadingContraint" destination="k5O-4W-nBs" id="Y70-je-9ym"/>
  63.650 +                        <outlet property="topbarImageView" destination="P9a-4R-73k" id="fLf-fw-L4U"/>
  63.651 +                        <outlet property="topbarLabel" destination="26J-Qa-GAl" id="Ilb-Bb-Ua0"/>
  63.652 +                        <outlet property="topbarLabelLeadingConstraint" destination="RIs-Sh-mwP" id="fcY-jx-j7v"/>
  63.653 +                        <outlet property="topbarWidthConstraint" destination="pfl-8K-3WN" id="NLk-XZ-cNh"/>
  63.654 +                    </connections>
  63.655 +                </viewController>
  63.656 +                <placeholder placeholderIdentifier="IBFirstResponder" id="Oai-ey-sKC" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  63.657 +            </objects>
  63.658 +            <point key="canvasLocation" x="-965.21739130434787" y="1370.7589285714284"/>
  63.659 +        </scene>
  63.660 +        <!--Tutorial Step1 View Controller-->
  63.661 +        <scene sceneID="OsB-ct-rVS">
  63.662 +            <objects>
  63.663 +                <viewController storyboardIdentifier="TutorialStep1ViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="VXF-pR-LHy" customClass="TutorialStep1ViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
  63.664 +                    <view key="view" contentMode="scaleToFill" id="grS-IF-3BO">
  63.665 +                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
  63.666 +                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  63.667 +                        <subviews>
  63.668 +                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uzZ-Nm-l2O">
  63.669 +                                <rect key="frame" x="12" y="30" width="296" height="383.5"/>
  63.670 +                                <subviews>
  63.671 +                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="id3-re-RXX" userLabel="Secure container">
  63.672 +                                        <rect key="frame" x="94.5" y="0.0" width="107" height="24"/>
  63.673 +                                        <subviews>
  63.674 +                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pEpForIOS-Asset-Tutorial-2a" translatesAutoresizingMaskIntoConstraints="NO" id="YzF-4K-1Ig" userLabel="Secure Image View">
  63.675 +                                                <rect key="frame" x="0.0" y="-8" width="40" height="40"/>
  63.676 +                                                <constraints>
  63.677 +                                                    <constraint firstAttribute="width" secondItem="YzF-4K-1Ig" secondAttribute="height" multiplier="1:1" id="RFB-lo-sC7"/>
  63.678 +                                                    <constraint firstAttribute="width" constant="40" id="mUC-Hj-I0O">
  63.679 +                                                        <variation key="heightClass=compact-widthClass=compact" constant="30"/>
  63.680 +                                                    </constraint>
  63.681 +                                                </constraints>
  63.682 +                                            </imageView>
  63.683 +                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Secure" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I8H-Tq-jkV">
  63.684 +                                                <rect key="frame" x="46" y="0.0" width="61" height="24"/>
  63.685 +                                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
  63.686 +                                                <nil key="textColor"/>
  63.687 +                                                <nil key="highlightedColor"/>
  63.688 +                                            </label>
  63.689 +                                        </subviews>
  63.690 +                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.691 +                                        <constraints>
  63.692 +                                            <constraint firstItem="YzF-4K-1Ig" firstAttribute="leading" secondItem="id3-re-RXX" secondAttribute="leading" id="Ag6-et-Wth"/>
  63.693 +                                            <constraint firstItem="YzF-4K-1Ig" firstAttribute="centerY" secondItem="I8H-Tq-jkV" secondAttribute="centerY" id="E3Z-fA-b2m"/>
  63.694 +                                            <constraint firstAttribute="bottom" secondItem="I8H-Tq-jkV" secondAttribute="bottom" id="RS4-5w-3MD"/>
  63.695 +                                            <constraint firstItem="I8H-Tq-jkV" firstAttribute="centerY" secondItem="id3-re-RXX" secondAttribute="centerY" id="SDc-jV-zBD"/>
  63.696 +                                            <constraint firstItem="I8H-Tq-jkV" firstAttribute="leading" secondItem="YzF-4K-1Ig" secondAttribute="trailing" constant="6" id="q3W-Ri-ykg"/>
  63.697 +                                            <constraint firstAttribute="trailing" secondItem="I8H-Tq-jkV" secondAttribute="trailing" id="rhB-rx-oQS"/>
  63.698 +                                        </constraints>
  63.699 +                                    </view>
  63.700 +                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uqG-OB-ggb" userLabel="Secure Description">
  63.701 +                                        <rect key="frame" x="22.5" y="34" width="251" height="84"/>
  63.702 +                                        <string key="text">With this Privacy Status all communication is Secure, but to confirm that your contact is really the person you know, you should compare Trustwords with this contact.</string>
  63.703 +                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
  63.704 +                                        <nil key="textColor"/>
  63.705 +                                        <nil key="highlightedColor"/>
  63.706 +                                    </label>
  63.707 +                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Cf-ZY-KpO" userLabel="Secure &amp; Trusted container">
  63.708 +                                        <rect key="frame" x="50.5" y="148" width="195" height="24"/>
  63.709 +                                        <subviews>
  63.710 +                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pEpForIOS-Asset-Tutorial-2b" translatesAutoresizingMaskIntoConstraints="NO" id="WqY-Ai-lfn" userLabel="Secure &amp; Trusted Image View">
  63.711 +                                                <rect key="frame" x="0.0" y="-8" width="40" height="40"/>
  63.712 +                                                <constraints>
  63.713 +                                                    <constraint firstAttribute="width" secondItem="WqY-Ai-lfn" secondAttribute="height" multiplier="1:1" id="mye-cC-3xh"/>
  63.714 +                                                    <constraint firstAttribute="width" constant="40" id="uNX-be-OuC">
  63.715 +                                                        <variation key="heightClass=compact-widthClass=compact" constant="30"/>
  63.716 +                                                    </constraint>
  63.717 +                                                </constraints>
  63.718 +                                            </imageView>
  63.719 +                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Secure &amp; Trusted" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DFW-OW-8OC">
  63.720 +                                                <rect key="frame" x="46" y="0.0" width="149" height="24"/>
  63.721 +                                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
  63.722 +                                                <nil key="textColor"/>
  63.723 +                                                <nil key="highlightedColor"/>
  63.724 +                                            </label>
  63.725 +                                        </subviews>
  63.726 +                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.727 +                                        <constraints>
  63.728 +                                            <constraint firstItem="WqY-Ai-lfn" firstAttribute="leading" secondItem="4Cf-ZY-KpO" secondAttribute="leading" id="4C7-6g-eAD"/>
  63.729 +                                            <constraint firstItem="DFW-OW-8OC" firstAttribute="leading" secondItem="WqY-Ai-lfn" secondAttribute="trailing" constant="6" id="VbX-zt-m1H"/>
  63.730 +                                            <constraint firstItem="WqY-Ai-lfn" firstAttribute="centerY" secondItem="DFW-OW-8OC" secondAttribute="centerY" id="W6U-zi-k1F"/>
  63.731 +                                            <constraint firstAttribute="trailing" secondItem="DFW-OW-8OC" secondAttribute="trailing" id="ldI-Wj-R1y"/>
  63.732 +                                            <constraint firstAttribute="bottom" secondItem="DFW-OW-8OC" secondAttribute="bottom" id="tsm-sY-2Ez"/>
  63.733 +                                            <constraint firstItem="DFW-OW-8OC" firstAttribute="centerY" secondItem="4Cf-ZY-KpO" secondAttribute="centerY" id="uYo-Ie-BLf"/>
  63.734 +                                        </constraints>
  63.735 +                                    </view>
  63.736 +                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zhc-gu-hRF" userLabel="Secure &amp; Trusted description">
  63.737 +                                        <rect key="frame" x="12" y="192" width="272.5" height="67"/>
  63.738 +                                        <constraints>
  63.739 +                                            <constraint firstAttribute="height" priority="1" constant="41" id="uqZ-4h-Edh"/>
  63.740 +                                        </constraints>
  63.741 +                                        <string key="text">When the Trustwords are confirmed to be correct and the Handshake is done, the communication will be completely secure and trusted</string>
  63.742 +                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
  63.743 +                                        <nil key="textColor"/>
  63.744 +                                        <nil key="highlightedColor"/>
  63.745 +                                    </label>
  63.746 +                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DOV-HD-FrV" userLabel="Mistrusted container">
  63.747 +                                        <rect key="frame" x="77" y="289" width="142" height="24"/>
  63.748 +                                        <subviews>
  63.749 +                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pEpForIOS-Asset-Tutorial-2c" translatesAutoresizingMaskIntoConstraints="NO" id="fgs-5m-efL" userLabel="Mistrusted Image View">
  63.750 +                                                <rect key="frame" x="0.0" y="-6.5" width="43" height="37"/>
  63.751 +                                                <constraints>
  63.752 +                                                    <constraint firstAttribute="width" constant="43" id="Dlz-ue-ErG">
  63.753 +                                                        <variation key="heightClass=compact-widthClass=compact" constant="30"/>
  63.754 +                                                    </constraint>
  63.755 +                                                    <constraint firstAttribute="width" secondItem="fgs-5m-efL" secondAttribute="height" multiplier="43:37" id="Hcq-oj-Njc"/>
  63.756 +                                                </constraints>
  63.757 +                                            </imageView>
  63.758 +                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Mistrusted" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eK9-eY-X1L">
  63.759 +                                                <rect key="frame" x="49" y="0.0" width="93" height="24"/>
  63.760 +                                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
  63.761 +                                                <nil key="textColor"/>
  63.762 +                                                <nil key="highlightedColor"/>
  63.763 +                                            </label>
  63.764 +                                        </subviews>
  63.765 +                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
  63.766 +                                        <constraints>
  63.767 +                                            <constraint firstItem="eK9-eY-X1L" firstAttribute="leading" secondItem="fgs-5m-efL" secondAttribute="trailing" constant="6" id="13Q-Ru-DLT"/>
  63.768 +                                            <constraint firstItem="fgs-5m-efL" firstAttribute="leading" secondItem="DOV-HD-FrV" secondAttribute="leading" id="HSF-3S-kOp"/>
  63.769 +                                            <constraint firstItem="eK9-eY-X1L" firstAttribute="centerY" secondItem="DOV-HD-FrV" secondAttribute="centerY" id="QPX-5a-Ffs"/>
  63.770 +                                            <constraint firstAttribute="bottom" secondItem="eK9-eY-X1L" secondAttribute="bottom" id="afw-tV-kLX"/>
  63.771 +                                            <constraint firstAttribute="trailing" secondItem="eK9-eY-X1L" secondAttribute="trailing" id="iDC-bP-5GT"/>
  63.772 +                                            <constraint firstItem="fgs-5m-efL" firstAttribute="centerY" secondItem="eK9-eY-X1L" secondAttribute="centerY" id="xMi-X2-2wO"/>
  63.773 +                                        </constraints>
  63.774 +                                    </view>
  63.775 +                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="If the Trustwords are not correct, there could be an attack by a man‑in‑the‑middle." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Cq-ai-hYf" userLabel="Secure &amp; Trusted description">
  63.776 +                                        <rect key="frame" x="21" y="333" width="254.5" height="50.5"/>
  63.777 +                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
  63.778 +                                        <nil key="textColor"/>
  63.779 +                                        <nil key="highlightedColor"/>
  63.780 +                                    </label>
  63.781 +                                </subviews>
  63.782 +                                <constraints>
  63.783 +                                    <constraint firstItem="DOV-HD-FrV" firstAttribute="top" secondItem="Zhc-gu-hRF" secondAttribute="bottom" constant="10" id="1og-b8-dqE">
  63.784 +                                        <variation key="heightClass=regular" constant="30"/>
  63.785 +                                        <variation key="heightClass=compact-widthClass=compact" constant="15"/>
  63.786 +                                        <variation key="heightClass=compact-widthClass=regular" constant="20"/>
  63.787 +                                    </constraint>
  63.788 +                                    <constraint firstItem="DOV-HD-FrV" firstAttribute="centerX" secondItem="uzZ-Nm-l2O" secondAttribute="centerX" id="3gw-lW-SZa"/>
  63.789 +                                    <constraint firstItem="5Cq-ai-hYf" firstAttribute="top" secondItem="DOV-HD-FrV" secondAttribute="bottom" constant="10" id="Cer-Ib-vS0">
  63.790 +                                        <variation key="heightClass=regular" constant="20"/>
  63.791 +                                        <variation key="heightClass=compact-widthClass=regular" constant="15"/>
  63.792 +                                    </constraint>
  63.793 +                                    <constraint firstItem="id3-re-RXX" firstAttribute="top" secondItem="uzZ-Nm-l2O" secondAttribute="top" id="Giv-qb-ZOi">
  63.794 +                                        <variation key="heightClass=compact-widthClass=regular" constant="15"/>
  63.795 +                                    </constraint>
  63.796 +                                    <constraint firstItem="uqG-OB-ggb" firstAttribute="centerX" secondItem="id3-re-RXX" secondAttribute="centerX" id="MAR-hp-gOs"/>
  63.797 +                                    <constraint firstItem="Zhc-gu-hRF" firstAttribute="centerX" secondItem="uzZ-Nm-l2O" secondAttribute="centerX" id="Vtj-8L-aZJ"/>
  63.798 +                                    <constraint firstItem="Zhc-gu-hRF" firstAttribute="top" secondItem="4Cf-ZY-KpO" secondAttribute="bottom" constant="10" id="WMr-pK-3LX">
  63.799 +                                        <variation key="heightClass=regular" constant="20"/>
  63.800 +                                        <variation key="heightClass=compact-widthClass=regular" constant="15"/>
  63.801 +                                    </constraint>
  63.802 +                                    <constraint firstAttribute="bottom" secondItem="5Cq-ai-hYf" secondAttribute="bottom" id="Wre-Tw-FYB"/>
  63.803 +                                    <constraint firstItem="4Cf-ZY-KpO" firstAttribute="centerX" secondItem="uzZ-Nm-l2O" secondAttribute="centerX" id="fMJ-Dc-4Vo"/>
  63.804 +                                    <constraint firstItem="uqG-OB-ggb" firstAttribute="top" secondItem="id3-re-RXX" secondAttribute="bottom" constant="10" id="hnD-Ky-Gac">
  63.805 +                                        <variation key="heightClass=compact-widthClass=regular" constant="15"/>
  63.806 +                                    </constraint>
  63.807 +                                    <constraint firstItem="uqG-OB-ggb" firstAttribute="centerX" secondItem="uzZ-Nm-l2O" secondAttribute="centerX" id="hvP-T7-7yZ"/>
  63.808 +                                    <constraint firstItem="5Cq-ai-hYf" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uzZ-Nm-l2O" secondAttribute="leading" constant="10" id="jwb-8D-2X2">
  63.809 +                                        <variation key="heightClass=compact-widthClass=regular" constant="60"/>
  63.810 +                                        <variation key="heightClass=regular-widthClass=regular" constant="60"/>
  63.811 +                                    </constraint>
  63.812 +                                    <constraint firstAttribute="width" priority="250" constant="300" id="nv0-8u-6ra"/>
  63.813 +                                    <constraint firstItem="4Cf-ZY-KpO" firstAttribute="top" secondItem="uqG-OB-ggb" secondAttribute="bottom" constant="8" symbolic="YES" id="tvh-f5-d7H">
  63.814 +                                        <variation key="heightClass=regular" constant="30"/>
  63.815 +                                        <variation key="heightClass=compact-widthClass=compact" constant="15"/>
  63.816 +                                        <variation key="heightClass=compact-widthClass=regular" constant="20"/>
  63.817 +                                    </constraint>
  63.818 +                                    <constraint firstItem="Zhc-gu-hRF" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uzZ-Nm-l2O" secondAttribute="leading" constant="10" id="u9D-R0-NTF">
  63.819 +                                        <variation key="heightClass=compact-widthClass=regular" constant="60"/>
  63.820 +                                        <variation key="heightClass=regular-widthClass=regular" constant="60"/>
  63.821 +                                    </constraint>
  63.822 +                                    <constraint firstItem="5Cq-ai-hYf" firstAttribute="centerX" secondItem="uzZ-Nm-l2O" secondAttribute="centerX" id="vd3-VC-Laq"/>
  63.823 +                                    <constraint firstItem="uqG-OB-ggb" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uzZ-Nm-l2O" secondAttribute="leading" constant="20" id="wwd-Sv-nUp">
  63.824 +                                        <variation key="heightClass=compact-widthClass=regular" constant="60"/>
  63.825 +                                        <variation key="heightClass=regular-widthClass=regular" constant="60"/>
  63.826 +                                    </constraint>
  63.827 +                                </constraints>
  63.828 +                            </view>
  63.829 +                        </subviews>
  63.830 +                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  63.831 +                        <constraints>
  63.832 +                            <constraint firstItem="uzZ-Nm-l2O" firstAttribute="centerY" secondItem="kLE-yy-8dB" secondAttribute="centerY" multiplier="1.2" id="0xp-Lb-sjU"/>
  63.833 +                            <constraint firstItem="uzZ-Nm-l2O" firstAttribute="centerX" secondItem="kLE-yy-8dB" secondAttribute="centerX" id="3ac-jZ-ll5"/>
  63.834 +                            <constraint firstItem="uzZ-Nm-l2O" firstAttribute="centerY" secondItem="kLE-yy-8dB" secondAttribute="centerY" multiplier="1.18" id="Bug-xo-ll0"/>
  63.835 +                            <constraint firstItem="uzZ-Nm-l2O" firstAttribute="top" secondItem="kLE-yy-8dB" secondAttribute="top" constant="30" id="Qxp-Gg-VZq"/>
  63.836 +                            <constraint firstItem="kLE-yy-8dB" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="uzZ-Nm-l2O" secondAttribute="trailing" constant="12" id="TT6-Ct-qMz"/>
  63.837 +                        </constraints>
  63.838 +                        <viewLayoutGuide key="safeArea" id="kLE-yy-8dB"/>
  63.839 +                        <variation key="default">
  63.840 +                            <mask key="constraints">
  63.841 +                                <exclude reference="0xp-Lb-sjU"/>
  63.842 +                                <exclude reference="Qxp-Gg-VZq"/>
  63.843 +                            </mask>
  63.844 +                        </variation>
  63.845 +                        <variation key="heightClass=compact-widthClass=regular">
  63.846 +                            <mask key="constraints">
  63.847 +                                <include reference="0xp-Lb-sjU"/>
  63.848 +                                <exclude reference="Bug-xo-ll0"/>
  63.849 +                            </mask>
  63.850 +                        </variation>
  63.851 +                        <variation key="heightClass=regular-widthClass=compact">
  63.852 +                            <mask key="constraints">
  63.853 +                                <exclude reference="Bug-xo-ll0"/>
  63.854 +                                <include reference="Qxp-Gg-VZq"/>
  63.855 +                            </mask>
  63.856 +                        </variation>
  63.857 +                    </view>
  63.858 +                    <connections>
  63.859 +                        <outlet property="centerY" destination="Bug-xo-ll0" id="eqx-pL-7vL"/>
  63.860 +                        <outlet property="mistrustedDescription" destination="5Cq-ai-hYf" id="7EL-ME-Gwg"/>
  63.861 +                        <outlet property="mistrustedLabel" destination="eK9-eY-X1L" id="Ye0-PQ-xpG"/>
  63.862 +                        <outlet property="secureAndTrustDescription" destination="Zhc-gu-hRF" id="M5L-LR-XYQ"/>
  63.863 +                        <outlet property="secureAndTrustedLabel" destination="DFW-OW-8OC" id="u5C-sD-3gL"/>
  63.864 +                        <outlet property="secureDescriptionLabel" destination="uqG-OB-ggb" id="7Ic-ry-z9f"/>
  63.865 +                        <outlet property="secureLabel" destination="I8H-Tq-jkV" id="3X8-DW-adz"/>
  63.866 +                    </connections>
  63.867 +                </viewController>
  63.868 +                <placeholder placeholderIdentifier="IBFirstResponder" id="krx-U5-0Ho" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
  63.869 +            </objects>
  63.870 +            <point key="canvasLocation" x="-290" y="1371"/>
  63.871 +        </scene>
  63.872      </scenes>
  63.873      <resources>
  63.874 +        <image name="pEp-status-msg-yellow" width="60" height="21"/>
  63.875 +        <image name="pEpForIOS-Asset-Tutorial-1a" width="58" height="58"/>
  63.876 +        <image name="pEpForIOS-Asset-Tutorial-1b" width="334" height="59"/>
  63.877 +        <image name="pEpForIOS-Asset-Tutorial-2a" width="40" height="40"/>
  63.878 +        <image name="pEpForIOS-Asset-Tutorial-2b" width="40" height="40"/>
  63.879 +        <image name="pEpForIOS-Asset-Tutorial-2c" width="43" height="37"/>
  63.880 +        <image name="pEpForIOS-Asset-Tutorial-4" width="335" height="95"/>
  63.881          <image name="pEpForiOS-icon-languagechange" width="100" height="100"/>
  63.882      </resources>
  63.883  </document>
    64.1 --- a/pEpForiOS/Base.lproj/Settings.storyboard	Tue Feb 18 18:23:43 2020 +0100
    64.2 +++ b/pEpForiOS/Base.lproj/Settings.storyboard	Thu Mar 12 09:49:46 2020 +0100
    64.3 @@ -1,9 +1,9 @@
    64.4  <?xml version="1.0" encoding="UTF-8"?>
    64.5 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="cPx-YX-3ty">
    64.6 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="cPx-YX-3ty">
    64.7      <device id="retina4_7" orientation="portrait" appearance="light"/>
    64.8      <dependencies>
    64.9          <deployment identifier="iOS"/>
   64.10 -        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
   64.11 +        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
   64.12          <capability name="Safe area layout guides" minToolsVersion="9.0"/>
   64.13          <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
   64.14      </dependencies>
   64.15 @@ -27,7 +27,7 @@
   64.16          <scene sceneID="ODz-Rf-1g6">
   64.17              <objects>
   64.18                  <tableViewController storyboardIdentifier="SettingsTableViewController" id="cPx-YX-3ty" customClass="SettingsTableViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   64.19 -                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="FPz-NY-KRU">
   64.20 +                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="1" id="FPz-NY-KRU">
   64.21                          <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
   64.22                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   64.23                          <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
   64.24 @@ -118,7 +118,6 @@
   64.25                          <barButtonItem systemItem="compose" id="eLo-P1-6VE"/>
   64.26                      </toolbarItems>
   64.27                      <connections>
   64.28 -                        <segue destination="9z2-yI-qGJ" kind="showDetail" identifier="segueEditAccount" id="WKY-VX-I5i"/>
   64.29                          <segue destination="9LH-QE-79O" kind="showDetail" identifier="sequeShowCredits" id="H2d-0I-oCO"/>
   64.30                          <segue destination="1at-88-jou" kind="unwind" identifier="noAccounts" unwindAction="segueUnwindLastAccountDeletedWithSegue:" id="dbj-Gx-Exo"/>
   64.31                          <segue destination="pQb-5p-QId" kind="showDetail" identifier="segueShowSettingDefaultAccount" id="qiY-7g-nll"/>
   64.32 @@ -126,7 +125,7 @@
   64.33                          <segue destination="cMW-fr-EKn" kind="showDetail" identifier="segueSetOwnKey" id="D3B-Zt-U43"/>
   64.34                          <segue destination="4fP-ku-UtU" kind="showDetail" identifier="segueExtraKeys" id="DPP-UI-qfC"/>
   64.35                          <segue destination="tfJ-nw-QBg" kind="showDetail" identifier="ResetTrust" id="sr5-ig-b4W"/>
   64.36 -                        <segue destination="ubf-gx-0YH" kind="showDetail" identifier="seguePerAccountSync" id="PVg-TR-Zzb"/>
   64.37 +                        <segue destination="Eri-pJ-T3J" kind="showDetail" identifier="segueEditAccount" id="Flj-eg-anX"/>
   64.38                      </connections>
   64.39                  </tableViewController>
   64.40                  <placeholder placeholderIdentifier="IBFirstResponder" id="BPe-Zm-lKR" userLabel="First Responder" sceneMemberID="firstResponder"/>
   64.41 @@ -357,7 +356,7 @@
   64.42          <scene sceneID="8yf-Dg-eGD">
   64.43              <objects>
   64.44                  <tableViewController storyboardIdentifier="SettingDefaultAccountTableViewController" id="Eri-pJ-T3J" customClass="AccountSettingsTableViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   64.45 -                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Ilj-Hx-m63">
   64.46 +                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="50" estimatedSectionHeaderHeight="50" sectionFooterHeight="1" estimatedSectionFooterHeight="1" id="Ilj-Hx-m63">
   64.47                          <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
   64.48                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   64.49                          <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
   64.50 @@ -365,21 +364,21 @@
   64.51                              <tableViewSection id="1yQ-K0-PyO">
   64.52                                  <cells>
   64.53                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="LUk-Qy-gDE">
   64.54 -                                        <rect key="frame" x="0.0" y="18" width="375" height="44"/>
   64.55 +                                        <rect key="frame" x="0.0" y="50" width="375" height="44"/>
   64.56                                          <autoresizingMask key="autoresizingMask"/>
   64.57                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LUk-Qy-gDE" id="sNt-IF-jUh">
   64.58                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   64.59                                              <autoresizingMask key="autoresizingMask"/>
   64.60                                              <subviews>
   64.61 -                                                <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">
   64.62 -                                                    <rect key="frame" x="20" y="11.5" width="50" height="21"/>
   64.63 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
   64.64 +                                                <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">
   64.65 +                                                    <rect key="frame" x="20" y="11.5" width="45" height="21"/>
   64.66 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   64.67                                                      <nil key="textColor"/>
   64.68                                                      <nil key="highlightedColor"/>
   64.69                                                  </label>
   64.70 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="RpU-jD-tx7">
   64.71 -                                                    <rect key="frame" x="78" y="5" width="277" height="34"/>
   64.72 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
   64.73 +                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="RpU-jD-tx7">
   64.74 +                                                    <rect key="frame" x="130" y="5" width="225" height="34"/>
   64.75 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   64.76                                                      <textInputTraits key="textInputTraits"/>
   64.77                                                  </textField>
   64.78                                              </subviews>
   64.79 @@ -388,27 +387,28 @@
   64.80                                                  <constraint firstItem="QcW-va-Qh4" firstAttribute="leading" secondItem="sNt-IF-jUh" secondAttribute="leading" constant="20" symbolic="YES" id="3mK-26-ncs"/>
   64.81                                                  <constraint firstItem="QcW-va-Qh4" firstAttribute="centerY" secondItem="sNt-IF-jUh" secondAttribute="centerY" id="8Cz-cw-Gmv"/>
   64.82                                                  <constraint firstAttribute="trailing" secondItem="RpU-jD-tx7" secondAttribute="trailing" constant="20" symbolic="YES" id="EbZ-Xu-v29"/>
   64.83 +                                                <constraint firstItem="RpU-jD-tx7" firstAttribute="width" secondItem="sNt-IF-jUh" secondAttribute="width" multiplier="3:5" priority="750" id="ObA-oA-MJr"/>
   64.84                                                  <constraint firstItem="RpU-jD-tx7" firstAttribute="top" secondItem="sNt-IF-jUh" secondAttribute="top" constant="5" id="nox-SK-PBz"/>
   64.85 -                                                <constraint firstItem="RpU-jD-tx7" firstAttribute="leading" secondItem="QcW-va-Qh4" secondAttribute="trailing" constant="8" id="pSz-qa-Rf9"/>
   64.86 +                                                <constraint firstItem="RpU-jD-tx7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="QcW-va-Qh4" secondAttribute="trailing" constant="8" id="pSz-qa-Rf9"/>
   64.87                                              </constraints>
   64.88                                          </tableViewCellContentView>
   64.89                                      </tableViewCell>
   64.90                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="SCL-dZ-lKy">
   64.91 -                                        <rect key="frame" x="0.0" y="62" width="375" height="44"/>
   64.92 +                                        <rect key="frame" x="0.0" y="94" width="375" height="44"/>
   64.93                                          <autoresizingMask key="autoresizingMask"/>
   64.94                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SCL-dZ-lKy" id="eNg-Rw-EgK">
   64.95                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
   64.96                                              <autoresizingMask key="autoresizingMask"/>
   64.97                                              <subviews>
   64.98 -                                                <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">
   64.99 -                                                    <rect key="frame" x="20" y="11.5" width="46" height="21"/>
  64.100 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.101 +                                                <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">
  64.102 +                                                    <rect key="frame" x="20" y="11.5" width="41" height="21"/>
  64.103 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.104                                                      <nil key="textColor"/>
  64.105                                                      <nil key="highlightedColor"/>
  64.106                                                  </label>
  64.107 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FIa-wa-uSF">
  64.108 -                                                    <rect key="frame" x="74" y="5" width="281" height="34"/>
  64.109 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.110 +                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FIa-wa-uSF">
  64.111 +                                                    <rect key="frame" x="130" y="5" width="225" height="34"/>
  64.112 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.113                                                      <textInputTraits key="textInputTraits"/>
  64.114                                                  </textField>
  64.115                                              </subviews>
  64.116 @@ -416,88 +416,95 @@
  64.117                                                  <constraint firstItem="Ne5-6o-O4F" firstAttribute="centerY" secondItem="eNg-Rw-EgK" secondAttribute="centerY" id="Fxm-w2-JDk"/>
  64.118                                                  <constraint firstAttribute="trailing" secondItem="FIa-wa-uSF" secondAttribute="trailing" constant="20" symbolic="YES" id="JOy-Nk-b82"/>
  64.119                                                  <constraint firstAttribute="bottom" secondItem="FIa-wa-uSF" secondAttribute="bottom" constant="5" id="QVi-N2-Bx5"/>
  64.120 +                                                <constraint firstItem="FIa-wa-uSF" firstAttribute="width" secondItem="eNg-Rw-EgK" secondAttribute="width" multiplier="3:5" priority="750" id="RsD-NN-IYn"/>
  64.121                                                  <constraint firstItem="Ne5-6o-O4F" firstAttribute="leading" secondItem="eNg-Rw-EgK" secondAttribute="leading" constant="20" symbolic="YES" id="YWc-Zr-uhs"/>
  64.122                                                  <constraint firstItem="FIa-wa-uSF" firstAttribute="top" secondItem="eNg-Rw-EgK" secondAttribute="top" constant="5" id="fho-4n-Jf2"/>
  64.123 -                                                <constraint firstItem="FIa-wa-uSF" firstAttribute="leading" secondItem="Ne5-6o-O4F" secondAttribute="trailing" constant="8" id="ge4-TS-2XS"/>
  64.124 +                                                <constraint firstItem="FIa-wa-uSF" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Ne5-6o-O4F" secondAttribute="trailing" constant="8" id="ge4-TS-2XS"/>
  64.125                                              </constraints>
  64.126                                          </tableViewCellContentView>
  64.127                                      </tableViewCell>
  64.128                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="ha3-pb-H6q">
  64.129 -                                        <rect key="frame" x="0.0" y="106" width="375" height="44"/>
  64.130 +                                        <rect key="frame" x="0.0" y="138" width="375" height="44"/>
  64.131                                          <autoresizingMask key="autoresizingMask"/>
  64.132                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ha3-pb-H6q" id="EaS-It-0GM">
  64.133                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.134                                              <autoresizingMask key="autoresizingMask"/>
  64.135                                              <subviews>
  64.136 -                                                <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">
  64.137 -                                                    <rect key="frame" x="20" y="11.5" width="79" height="21"/>
  64.138 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.139 +                                                <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">
  64.140 +                                                    <rect key="frame" x="20" y="11.5" width="74" height="21"/>
  64.141 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.142                                                      <nil key="textColor"/>
  64.143                                                      <nil key="highlightedColor"/>
  64.144                                                  </label>
  64.145 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="74n-su-y4m">
  64.146 -                                                    <rect key="frame" x="107" y="5" width="248" height="34"/>
  64.147 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.148 +                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="74n-su-y4m">
  64.149 +                                                    <rect key="frame" x="130" y="5" width="225" height="34"/>
  64.150 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.151                                                      <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
  64.152                                                  </textField>
  64.153                                              </subviews>
  64.154                                              <constraints>
  64.155                                                  <constraint firstAttribute="bottom" secondItem="74n-su-y4m" secondAttribute="bottom" constant="5" id="8cF-oT-Sew"/>
  64.156 +                                                <constraint firstItem="74n-su-y4m" firstAttribute="width" secondItem="EaS-It-0GM" secondAttribute="width" multiplier="3:5" priority="750" id="Kfo-b5-43v"/>
  64.157                                                  <constraint firstItem="En6-h6-xZD" firstAttribute="leading" secondItem="EaS-It-0GM" secondAttribute="leading" constant="20" symbolic="YES" id="OFg-MZ-Wwx"/>
  64.158                                                  <constraint firstItem="En6-h6-xZD" firstAttribute="centerY" secondItem="EaS-It-0GM" secondAttribute="centerY" id="erb-al-HPM"/>
  64.159                                                  <constraint firstItem="74n-su-y4m" firstAttribute="top" secondItem="EaS-It-0GM" secondAttribute="top" constant="5" id="ftO-4e-rtL"/>
  64.160 -                                                <constraint firstItem="74n-su-y4m" firstAttribute="leading" secondItem="En6-h6-xZD" secondAttribute="trailing" constant="8" id="lq3-uF-qKx"/>
  64.161 +                                                <constraint firstItem="74n-su-y4m" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="En6-h6-xZD" secondAttribute="trailing" constant="8" id="lq3-uF-qKx"/>
  64.162                                                  <constraint firstAttribute="trailing" secondItem="74n-su-y4m" secondAttribute="trailing" constant="20" symbolic="YES" id="mz6-NY-jkA"/>
  64.163                                              </constraints>
  64.164                                          </tableViewCellContentView>
  64.165                                      </tableViewCell>
  64.166                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="cDc-tO-miL">
  64.167 -                                        <rect key="frame" x="0.0" y="150" width="375" height="44"/>
  64.168 +                                        <rect key="frame" x="0.0" y="182" width="375" height="44"/>
  64.169                                          <autoresizingMask key="autoresizingMask"/>
  64.170                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cDc-tO-miL" id="5a1-Zd-MSP">
  64.171                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.172                                              <autoresizingMask key="autoresizingMask"/>
  64.173                                              <subviews>
  64.174                                                  <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zHO-Gd-VWW">
  64.175 -                                                    <rect key="frame" x="310" y="6.5" width="51" height="31"/>
  64.176 +                                                    <rect key="frame" x="306" y="6.5" width="51" height="31"/>
  64.177                                                      <connections>
  64.178                                                          <action selector="switchPEPSyncToggle:" destination="Eri-pJ-T3J" eventType="valueChanged" id="q6q-fw-PGh"/>
  64.179                                                      </connections>
  64.180                                                  </switch>
  64.181                                                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="p≡p Sync" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tjb-uM-eUF">
  64.182 -                                                    <rect key="frame" x="16" y="11.5" width="75" height="21"/>
  64.183 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.184 +                                                    <rect key="frame" x="20" y="12" width="75" height="20"/>
  64.185 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.186                                                      <nil key="textColor"/>
  64.187                                                      <nil key="highlightedColor"/>
  64.188                                                  </label>
  64.189                                              </subviews>
  64.190                                              <constraints>
  64.191 -                                                <constraint firstItem="Tjb-uM-eUF" firstAttribute="leading" secondItem="5a1-Zd-MSP" secondAttribute="leadingMargin" id="3yI-49-LeI"/>
  64.192                                                  <constraint firstItem="Tjb-uM-eUF" firstAttribute="centerY" secondItem="5a1-Zd-MSP" secondAttribute="centerY" id="7lG-kZ-bme"/>
  64.193                                                  <constraint firstItem="zHO-Gd-VWW" firstAttribute="centerY" secondItem="5a1-Zd-MSP" secondAttribute="centerY" id="VjN-Mr-nY6"/>
  64.194 -                                                <constraint firstAttribute="trailing" secondItem="zHO-Gd-VWW" secondAttribute="trailing" constant="16" id="bk4-9q-Rsz"/>
  64.195 +                                                <constraint firstAttribute="trailing" secondItem="zHO-Gd-VWW" secondAttribute="trailing" constant="20" id="bk4-9q-Rsz"/>
  64.196 +                                                <constraint firstItem="zHO-Gd-VWW" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Tjb-uM-eUF" secondAttribute="trailing" constant="5" id="g5b-hx-Lx2"/>
  64.197 +                                                <constraint firstItem="Tjb-uM-eUF" firstAttribute="leading" secondItem="5a1-Zd-MSP" secondAttribute="leading" constant="20" id="kib-IQ-Fgh"/>
  64.198                                              </constraints>
  64.199                                          </tableViewCellContentView>
  64.200                                      </tableViewCell>
  64.201                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="SEz-qh-Tnn">
  64.202 -                                        <rect key="frame" x="0.0" y="194" width="375" height="44"/>
  64.203 +                                        <rect key="frame" x="0.0" y="226" width="375" height="44"/>
  64.204                                          <autoresizingMask key="autoresizingMask"/>
  64.205                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="SEz-qh-Tnn" id="tmW-r5-PIz">
  64.206                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.207                                              <autoresizingMask key="autoresizingMask"/>
  64.208                                              <subviews>
  64.209 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Reset This Identity" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4L6-wx-Ghl">
  64.210 -                                                    <rect key="frame" x="20" y="11.5" width="142" height="21"/>
  64.211 -                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  64.212 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.213 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reset" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4L6-wx-Ghl">
  64.214 +                                                    <rect key="frame" x="20" y="11.5" width="43.5" height="21"/>
  64.215 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.216                                                      <nil key="textColor"/>
  64.217                                                      <nil key="highlightedColor"/>
  64.218                                                  </label>
  64.219                                              </subviews>
  64.220 +                                            <constraints>
  64.221 +                                                <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="4L6-wx-Ghl" secondAttribute="trailing" constant="8" id="0Kk-dQ-wdV"/>
  64.222 +                                                <constraint firstItem="4L6-wx-Ghl" firstAttribute="centerY" secondItem="tmW-r5-PIz" secondAttribute="centerY" id="DOz-BT-aYh"/>
  64.223 +                                                <constraint firstItem="4L6-wx-Ghl" firstAttribute="leading" secondItem="tmW-r5-PIz" secondAttribute="leading" constant="20" id="KNn-BX-fYi"/>
  64.224 +                                            </constraints>
  64.225                                          </tableViewCellContentView>
  64.226                                      </tableViewCell>
  64.227                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="Bp7-9N-v9r">
  64.228 -                                        <rect key="frame" x="0.0" y="238" width="375" height="44"/>
  64.229 +                                        <rect key="frame" x="0.0" y="270" width="375" height="44"/>
  64.230                                          <autoresizingMask key="autoresizingMask"/>
  64.231                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Bp7-9N-v9r" id="UJO-pq-3Op">
  64.232                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.233 @@ -506,17 +513,17 @@
  64.234                                                  <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="tUA-ey-cn7">
  64.235                                                      <rect key="frame" x="335" y="12" width="20" height="20"/>
  64.236                                                  </activityIndicatorView>
  64.237 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OAuth2 Reauthorization" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxK-W7-y8D">
  64.238 -                                                    <rect key="frame" x="20" y="11.5" width="182" height="21"/>
  64.239 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.240 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OAuth2 Reauthorization" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxK-W7-y8D">
  64.241 +                                                    <rect key="frame" x="20" y="12" width="182" height="20.5"/>
  64.242 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.243                                                      <nil key="textColor"/>
  64.244                                                      <nil key="highlightedColor"/>
  64.245                                                  </label>
  64.246                                              </subviews>
  64.247                                              <constraints>
  64.248 -                                                <constraint firstItem="wxK-W7-y8D" firstAttribute="leading" secondItem="UJO-pq-3Op" secondAttribute="leadingMargin" constant="4" id="F5G-wx-YGI"/>
  64.249 +                                                <constraint firstItem="wxK-W7-y8D" firstAttribute="leading" secondItem="UJO-pq-3Op" secondAttribute="leading" constant="20" id="8F9-Jg-Yd7"/>
  64.250                                                  <constraint firstItem="wxK-W7-y8D" firstAttribute="centerY" secondItem="UJO-pq-3Op" secondAttribute="centerY" id="Ond-PS-O1g"/>
  64.251 -                                                <constraint firstItem="tUA-ey-cn7" firstAttribute="leading" secondItem="wxK-W7-y8D" secondAttribute="trailing" priority="10" constant="133" id="bSc-Tg-PyM"/>
  64.252 +                                                <constraint firstItem="tUA-ey-cn7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="wxK-W7-y8D" secondAttribute="trailing" constant="8" id="bSc-Tg-PyM"/>
  64.253                                                  <constraint firstItem="tUA-ey-cn7" firstAttribute="centerY" secondItem="wxK-W7-y8D" secondAttribute="centerY" id="ddu-74-bgz"/>
  64.254                                                  <constraint firstAttribute="trailingMargin" secondItem="tUA-ey-cn7" secondAttribute="trailing" constant="4" id="k0D-DT-ChU"/>
  64.255                                              </constraints>
  64.256 @@ -527,21 +534,21 @@
  64.257                              <tableViewSection id="jRx-Lq-gZP">
  64.258                                  <cells>
  64.259                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="Cc3-aU-8MV">
  64.260 -                                        <rect key="frame" x="0.0" y="318" width="375" height="44"/>
  64.261 +                                        <rect key="frame" x="0.0" y="365" width="375" height="44"/>
  64.262                                          <autoresizingMask key="autoresizingMask"/>
  64.263                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Cc3-aU-8MV" id="VDT-D7-V0v">
  64.264                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.265                                              <autoresizingMask key="autoresizingMask"/>
  64.266                                              <subviews>
  64.267 -                                                <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">
  64.268 -                                                    <rect key="frame" x="20" y="11.5" width="55" height="21"/>
  64.269 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.270 +                                                <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">
  64.271 +                                                    <rect key="frame" x="20" y="11.5" width="50" height="21"/>
  64.272 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.273                                                      <nil key="textColor"/>
  64.274                                                      <nil key="highlightedColor"/>
  64.275                                                  </label>
  64.276 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LOO-6m-Q5O">
  64.277 -                                                    <rect key="frame" x="83" y="5" width="272" height="34"/>
  64.278 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.279 +                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LOO-6m-Q5O">
  64.280 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.281 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.282                                                      <textInputTraits key="textInputTraits"/>
  64.283                                                  </textField>
  64.284                                              </subviews>
  64.285 @@ -550,27 +557,28 @@
  64.286                                                  <constraint firstAttribute="trailing" secondItem="LOO-6m-Q5O" secondAttribute="trailing" constant="20" symbolic="YES" id="Vfd-dP-TT5"/>
  64.287                                                  <constraint firstItem="weI-Bw-0PK" firstAttribute="leading" secondItem="VDT-D7-V0v" secondAttribute="leading" constant="20" symbolic="YES" id="gYU-3V-XcH"/>
  64.288                                                  <constraint firstAttribute="bottom" secondItem="LOO-6m-Q5O" secondAttribute="bottom" constant="5" id="hcY-BW-20v"/>
  64.289 -                                                <constraint firstItem="LOO-6m-Q5O" firstAttribute="leading" secondItem="weI-Bw-0PK" secondAttribute="trailing" constant="8" id="pEy-o6-TrM"/>
  64.290 +                                                <constraint firstItem="LOO-6m-Q5O" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="weI-Bw-0PK" secondAttribute="trailing" constant="8" id="pEy-o6-TrM"/>
  64.291 +                                                <constraint firstItem="LOO-6m-Q5O" firstAttribute="width" secondItem="VDT-D7-V0v" secondAttribute="width" multiplier="3:7" priority="750" id="wm4-ag-Lg5"/>
  64.292                                                  <constraint firstItem="weI-Bw-0PK" firstAttribute="centerY" secondItem="VDT-D7-V0v" secondAttribute="centerY" id="zuA-Wy-mFv"/>
  64.293                                              </constraints>
  64.294                                          </tableViewCellContentView>
  64.295                                      </tableViewCell>
  64.296                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="4xD-xp-8G4">
  64.297 -                                        <rect key="frame" x="0.0" y="362" width="375" height="44"/>
  64.298 +                                        <rect key="frame" x="0.0" y="409" width="375" height="44"/>
  64.299                                          <autoresizingMask key="autoresizingMask"/>
  64.300                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4xD-xp-8G4" id="c2f-YG-9nA">
  64.301                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.302                                              <autoresizingMask key="autoresizingMask"/>
  64.303                                              <subviews>
  64.304 -                                                <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">
  64.305 -                                                    <rect key="frame" x="20" y="11.5" width="37" height="21"/>
  64.306 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.307 +                                                <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">
  64.308 +                                                    <rect key="frame" x="20" y="11.5" width="32.5" height="21"/>
  64.309 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.310                                                      <nil key="textColor"/>
  64.311                                                      <nil key="highlightedColor"/>
  64.312                                                  </label>
  64.313 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ukB-K0-MMG">
  64.314 -                                                    <rect key="frame" x="65" y="5" width="290" height="34"/>
  64.315 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.316 +                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ukB-K0-MMG">
  64.317 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.318 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.319                                                      <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
  64.320                                                  </textField>
  64.321                                              </subviews>
  64.322 @@ -579,66 +587,72 @@
  64.323                                                  <constraint firstItem="zDb-ax-ng4" firstAttribute="leading" secondItem="c2f-YG-9nA" secondAttribute="leading" constant="20" symbolic="YES" id="Ckg-mT-cyd"/>
  64.324                                                  <constraint firstItem="zDb-ax-ng4" firstAttribute="centerY" secondItem="c2f-YG-9nA" secondAttribute="centerY" id="DCf-27-4mp"/>
  64.325                                                  <constraint firstAttribute="bottom" secondItem="ukB-K0-MMG" secondAttribute="bottom" constant="5" id="Iip-hF-XJd"/>
  64.326 +                                                <constraint firstItem="ukB-K0-MMG" firstAttribute="width" secondItem="c2f-YG-9nA" secondAttribute="width" multiplier="3:7" priority="750" id="P3P-v6-9a8"/>
  64.327                                                  <constraint firstAttribute="trailing" secondItem="ukB-K0-MMG" secondAttribute="trailing" constant="20" symbolic="YES" id="dJC-Je-QIl"/>
  64.328 -                                                <constraint firstItem="ukB-K0-MMG" firstAttribute="leading" secondItem="zDb-ax-ng4" secondAttribute="trailing" constant="8" id="jA4-Z3-go4"/>
  64.329 +                                                <constraint firstItem="ukB-K0-MMG" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="zDb-ax-ng4" secondAttribute="trailing" constant="8" id="jA4-Z3-go4"/>
  64.330                                              </constraints>
  64.331                                          </tableViewCellContentView>
  64.332                                      </tableViewCell>
  64.333                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="YSq-Sp-yAE">
  64.334 -                                        <rect key="frame" x="0.0" y="406" width="375" height="44"/>
  64.335 +                                        <rect key="frame" x="0.0" y="453" width="375" height="44"/>
  64.336                                          <autoresizingMask key="autoresizingMask"/>
  64.337                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YSq-Sp-yAE" id="atq-ig-qWw">
  64.338                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.339                                              <autoresizingMask key="autoresizingMask"/>
  64.340                                              <subviews>
  64.341 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transport Security:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="daw-LF-EZF">
  64.342 -                                                    <rect key="frame" x="20" y="11.5" width="146.5" height="21"/>
  64.343 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.344 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transport Security" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="daw-LF-EZF">
  64.345 +                                                    <rect key="frame" x="20" y="11.5" width="142" height="21"/>
  64.346 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.347                                                      <nil key="textColor"/>
  64.348                                                      <nil key="highlightedColor"/>
  64.349                                                  </label>
  64.350 -                                                <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rCJ-UW-Jmn" customClass="nonEditMenuUiTextField" customModule="pEpForiOS" customModuleProvider="target">
  64.351 -                                                    <rect key="frame" x="174.5" y="5" width="180.5" height="34"/>
  64.352 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.353 +                                                <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rCJ-UW-Jmn" customClass="nonEditMenuUiTextField" customModule="pEpForiOS" customModuleProvider="target">
  64.354 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.355 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.356                                                      <textInputTraits key="textInputTraits"/>
  64.357                                                  </textField>
  64.358                                              </subviews>
  64.359                                              <constraints>
  64.360                                                  <constraint firstItem="daw-LF-EZF" firstAttribute="centerY" secondItem="atq-ig-qWw" secondAttribute="centerY" id="6jY-lB-4cf"/>
  64.361                                                  <constraint firstItem="daw-LF-EZF" firstAttribute="leading" secondItem="atq-ig-qWw" secondAttribute="leading" constant="20" symbolic="YES" id="9Qv-mP-ZH1"/>
  64.362 +                                                <constraint firstItem="rCJ-UW-Jmn" firstAttribute="width" secondItem="atq-ig-qWw" secondAttribute="width" multiplier="3:7" priority="750" id="GUZ-32-QPS"/>
  64.363                                                  <constraint firstItem="rCJ-UW-Jmn" firstAttribute="top" secondItem="atq-ig-qWw" secondAttribute="top" constant="5" id="KpZ-cD-IEy"/>
  64.364 -                                                <constraint firstItem="rCJ-UW-Jmn" firstAttribute="leading" secondItem="daw-LF-EZF" secondAttribute="trailing" constant="8" id="Rsa-EH-T3F"/>
  64.365 +                                                <constraint firstItem="rCJ-UW-Jmn" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="daw-LF-EZF" secondAttribute="trailing" constant="8" id="Rsa-EH-T3F"/>
  64.366                                                  <constraint firstAttribute="trailing" secondItem="rCJ-UW-Jmn" secondAttribute="trailing" constant="20" symbolic="YES" id="auT-7o-Yfz"/>
  64.367                                                  <constraint firstAttribute="bottom" secondItem="rCJ-UW-Jmn" secondAttribute="bottom" constant="5" id="j5P-Y9-Crs"/>
  64.368                                              </constraints>
  64.369                                          </tableViewCellContentView>
  64.370                                      </tableViewCell>
  64.371 -                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="Opu-Se-iSh">
  64.372 -                                        <rect key="frame" x="0.0" y="450" width="375" height="44"/>
  64.373 +                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="UGq-5m-TEs">
  64.374 +                                        <rect key="frame" x="0.0" y="497" width="375" height="44"/>
  64.375                                          <autoresizingMask key="autoresizingMask"/>
  64.376 -                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Opu-Se-iSh" id="3ju-kD-Rc2">
  64.377 +                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UGq-5m-TEs" id="e81-s5-2Gp">
  64.378                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.379                                              <autoresizingMask key="autoresizingMask"/>
  64.380                                              <subviews>
  64.381 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l6l-lO-WTg">
  64.382 -                                                    <rect key="frame" x="20" y="11.5" width="84" height="21"/>
  64.383 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.384 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzX-eS-BYY">
  64.385 +                                                    <rect key="frame" x="20" y="11.5" width="78.5" height="21"/>
  64.386 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.387                                                      <nil key="textColor"/>
  64.388                                                      <nil key="highlightedColor"/>
  64.389                                                  </label>
  64.390 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="20d-ES-uKL">
  64.391 -                                                    <rect key="frame" x="112" y="5" width="243" height="34"/>
  64.392 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.393 +                                                <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mWn-9q-m8m" customClass="nonEditMenuUiTextField" customModule="pEpForiOS" customModuleProvider="target">
  64.394 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.395 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.396                                                      <textInputTraits key="textInputTraits"/>
  64.397 +                                                    <connections>
  64.398 +                                                        <outlet property="delegate" destination="a1y-j3-omP" id="Hoh-Gb-g3p"/>
  64.399 +                                                    </connections>
  64.400                                                  </textField>
  64.401                                              </subviews>
  64.402                                              <constraints>
  64.403 -                                                <constraint firstItem="20d-ES-uKL" firstAttribute="leading" secondItem="l6l-lO-WTg" secondAttribute="trailing" constant="8" id="G28-82-5Ie"/>
  64.404 -                                                <constraint firstItem="l6l-lO-WTg" firstAttribute="leading" secondItem="3ju-kD-Rc2" secondAttribute="leading" constant="20" symbolic="YES" id="OF2-oM-82x"/>
  64.405 -                                                <constraint firstItem="l6l-lO-WTg" firstAttribute="centerY" secondItem="3ju-kD-Rc2" secondAttribute="centerY" id="Pfv-Uh-02G"/>
  64.406 -                                                <constraint firstAttribute="trailing" secondItem="20d-ES-uKL" secondAttribute="trailing" constant="20" symbolic="YES" id="dfD-20-ZZe"/>
  64.407 -                                                <constraint firstItem="20d-ES-uKL" firstAttribute="top" secondItem="3ju-kD-Rc2" secondAttribute="top" constant="5" id="f2o-od-e2j"/>
  64.408 -                                                <constraint firstAttribute="bottom" secondItem="20d-ES-uKL" secondAttribute="bottom" constant="5" id="jMk-Dt-A8M"/>
  64.409 +                                                <constraint firstAttribute="trailing" secondItem="mWn-9q-m8m" secondAttribute="trailing" constant="20" symbolic="YES" id="Jzg-h9-oPe"/>
  64.410 +                                                <constraint firstItem="mWn-9q-m8m" firstAttribute="top" secondItem="e81-s5-2Gp" secondAttribute="top" constant="5" id="KrJ-4A-s7P"/>
  64.411 +                                                <constraint firstAttribute="bottom" secondItem="mWn-9q-m8m" secondAttribute="bottom" constant="5" id="RWH-8e-Pxx"/>
  64.412 +                                                <constraint firstItem="vzX-eS-BYY" firstAttribute="leading" secondItem="e81-s5-2Gp" secondAttribute="leading" constant="20" symbolic="YES" id="SCw-Vw-wj0"/>
  64.413 +                                                <constraint firstItem="mWn-9q-m8m" firstAttribute="width" secondItem="e81-s5-2Gp" secondAttribute="width" multiplier="3:7" priority="750" id="TSa-7D-Zf1"/>
  64.414 +                                                <constraint firstItem="mWn-9q-m8m" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="vzX-eS-BYY" secondAttribute="trailing" constant="8" id="VQM-Qr-61O"/>
  64.415 +                                                <constraint firstItem="vzX-eS-BYY" firstAttribute="centerY" secondItem="e81-s5-2Gp" secondAttribute="centerY" id="WZW-ra-5U2"/>
  64.416                                              </constraints>
  64.417                                          </tableViewCellContentView>
  64.418                                      </tableViewCell>
  64.419 @@ -647,21 +661,21 @@
  64.420                              <tableViewSection id="lcp-bR-tG4">
  64.421                                  <cells>
  64.422                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="uQq-jB-jvC">
  64.423 -                                        <rect key="frame" x="0.0" y="530" width="375" height="44"/>
  64.424 +                                        <rect key="frame" x="0.0" y="592" width="375" height="44"/>
  64.425                                          <autoresizingMask key="autoresizingMask"/>
  64.426                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uQq-jB-jvC" id="oxu-Hi-Kpi">
  64.427                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.428                                              <autoresizingMask key="autoresizingMask"/>
  64.429                                              <subviews>
  64.430 -                                                <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">
  64.431 -                                                    <rect key="frame" x="20" y="11.5" width="55" height="21"/>
  64.432 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.433 +                                                <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">
  64.434 +                                                    <rect key="frame" x="20" y="11.5" width="50" height="21"/>
  64.435 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.436                                                      <nil key="textColor"/>
  64.437                                                      <nil key="highlightedColor"/>
  64.438                                                  </label>
  64.439 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fSa-9P-hot">
  64.440 -                                                    <rect key="frame" x="83" y="5" width="272" height="34"/>
  64.441 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.442 +                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fSa-9P-hot">
  64.443 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.444 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.445                                                      <textInputTraits key="textInputTraits"/>
  64.446                                                  </textField>
  64.447                                              </subviews>
  64.448 @@ -669,28 +683,29 @@
  64.449                                                  <constraint firstItem="fSa-9P-hot" firstAttribute="top" secondItem="oxu-Hi-Kpi" secondAttribute="top" constant="5" id="1KU-OW-nfO"/>
  64.450                                                  <constraint firstItem="DQ0-sB-CRx" firstAttribute="centerY" secondItem="oxu-Hi-Kpi" secondAttribute="centerY" id="4n7-u8-9uW"/>
  64.451                                                  <constraint firstAttribute="trailing" secondItem="fSa-9P-hot" secondAttribute="trailing" constant="20" symbolic="YES" id="8p8-st-Fc2"/>
  64.452 +                                                <constraint firstItem="fSa-9P-hot" firstAttribute="width" secondItem="oxu-Hi-Kpi" secondAttribute="width" multiplier="3:7" priority="750" id="EMS-k3-OeG"/>
  64.453                                                  <constraint firstItem="DQ0-sB-CRx" firstAttribute="leading" secondItem="oxu-Hi-Kpi" secondAttribute="leading" constant="20" symbolic="YES" id="Hzd-h8-m04"/>
  64.454 -                                                <constraint firstItem="fSa-9P-hot" firstAttribute="leading" secondItem="DQ0-sB-CRx" secondAttribute="trailing" constant="8" id="j9V-WQ-h6l"/>
  64.455 +                                                <constraint firstItem="fSa-9P-hot" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="DQ0-sB-CRx" secondAttribute="trailing" constant="8" id="j9V-WQ-h6l"/>
  64.456                                                  <constraint firstAttribute="bottom" secondItem="fSa-9P-hot" secondAttribute="bottom" constant="5" id="l9A-2k-LYH"/>
  64.457                                              </constraints>
  64.458                                          </tableViewCellContentView>
  64.459                                      </tableViewCell>
  64.460                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="3ok-CC-12G">
  64.461 -                                        <rect key="frame" x="0.0" y="574" width="375" height="44"/>
  64.462 +                                        <rect key="frame" x="0.0" y="636" width="375" height="44"/>
  64.463                                          <autoresizingMask key="autoresizingMask"/>
  64.464                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ok-CC-12G" id="a25-Mi-BL5">
  64.465                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.466                                              <autoresizingMask key="autoresizingMask"/>
  64.467                                              <subviews>
  64.468 -                                                <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">
  64.469 -                                                    <rect key="frame" x="20" y="11.5" width="37" height="21"/>
  64.470 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.471 +                                                <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">
  64.472 +                                                    <rect key="frame" x="20" y="11.5" width="32.5" height="21"/>
  64.473 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.474                                                      <nil key="textColor"/>
  64.475                                                      <nil key="highlightedColor"/>
  64.476                                                  </label>
  64.477 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="f4i-WV-eyd">
  64.478 -                                                    <rect key="frame" x="65" y="5" width="290" height="34"/>
  64.479 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.480 +                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="f4i-WV-eyd">
  64.481 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.482 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.483                                                      <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
  64.484                                                  </textField>
  64.485                                              </subviews>
  64.486 @@ -698,67 +713,73 @@
  64.487                                                  <constraint firstAttribute="trailing" secondItem="f4i-WV-eyd" secondAttribute="trailing" constant="20" symbolic="YES" id="9ij-x3-hqt"/>
  64.488                                                  <constraint firstItem="f4i-WV-eyd" firstAttribute="top" secondItem="a25-Mi-BL5" secondAttribute="top" constant="5" id="DvL-M8-3ue"/>
  64.489                                                  <constraint firstAttribute="bottom" secondItem="f4i-WV-eyd" secondAttribute="bottom" constant="5" id="Gs8-sB-ct2"/>
  64.490 -                                                <constraint firstItem="f4i-WV-eyd" firstAttribute="leading" secondItem="Vdb-LS-4JH" secondAttribute="trailing" constant="8" id="IUJ-PJ-xAx"/>
  64.491 +                                                <constraint firstItem="f4i-WV-eyd" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Vdb-LS-4JH" secondAttribute="trailing" constant="8" id="IUJ-PJ-xAx"/>
  64.492 +                                                <constraint firstItem="f4i-WV-eyd" firstAttribute="width" secondItem="a25-Mi-BL5" secondAttribute="width" multiplier="3:7" priority="750" id="Trr-V2-TBj"/>
  64.493                                                  <constraint firstItem="Vdb-LS-4JH" firstAttribute="leading" secondItem="a25-Mi-BL5" secondAttribute="leading" constant="20" symbolic="YES" id="XTH-hc-MnO"/>
  64.494                                                  <constraint firstItem="Vdb-LS-4JH" firstAttribute="centerY" secondItem="a25-Mi-BL5" secondAttribute="centerY" id="kcv-M0-RZf"/>
  64.495                                              </constraints>
  64.496                                          </tableViewCellContentView>
  64.497                                      </tableViewCell>
  64.498                                      <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="qam-JB-sRf">
  64.499 -                                        <rect key="frame" x="0.0" y="618" width="375" height="44"/>
  64.500 +                                        <rect key="frame" x="0.0" y="680" width="375" height="44"/>
  64.501                                          <autoresizingMask key="autoresizingMask"/>
  64.502                                          <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qam-JB-sRf" id="Cae-Xt-xQe">
  64.503                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.504                                              <autoresizingMask key="autoresizingMask"/>
  64.505                                              <subviews>
  64.506 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transport Security:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAL-c1-ngD">
  64.507 -                                                    <rect key="frame" x="20" y="11.5" width="146.5" height="21"/>
  64.508 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.509 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transport Security" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAL-c1-ngD">
  64.510 +                                                    <rect key="frame" x="20" y="11.5" width="142" height="21"/>
  64.511 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.512                                                      <nil key="textColor"/>
  64.513                                                      <nil key="highlightedColor"/>
  64.514                                                  </label>
  64.515 -                                                <textField opaque="NO" clipsSubviews="YES" tag="2" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JLc-di-cx2" customClass="nonEditMenuUiTextField" customModule="pEpForiOS" customModuleProvider="target">
  64.516 -                                                    <rect key="frame" x="174.5" y="5" width="180.5" height="34"/>
  64.517 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.518 +                                                <textField opaque="NO" clipsSubviews="YES" tag="2" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JLc-di-cx2" customClass="nonEditMenuUiTextField" customModule="pEpForiOS" customModuleProvider="target">
  64.519 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.520 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.521                                                      <textInputTraits key="textInputTraits"/>
  64.522                                                  </textField>
  64.523                                              </subviews>
  64.524                                              <constraints>
  64.525                                                  <constraint firstItem="JLc-di-cx2" firstAttribute="top" secondItem="Cae-Xt-xQe" secondAttribute="top" constant="5" id="9ht-R2-QV6"/>
  64.526                                                  <constraint firstItem="hAL-c1-ngD" firstAttribute="leading" secondItem="Cae-Xt-xQe" secondAttribute="leading" constant="20" symbolic="YES" id="D2G-Gr-Y86"/>
  64.527 +                                                <constraint firstItem="JLc-di-cx2" firstAttribute="width" secondItem="Cae-Xt-xQe" secondAttribute="width" multiplier="3:7" priority="750" id="S1Z-G8-OLX"/>
  64.528                                                  <constraint firstAttribute="trailing" secondItem="JLc-di-cx2" secondAttribute="trailing" constant="20" symbolic="YES" id="S6y-1D-Pks"/>
  64.529 -                                                <constraint firstItem="JLc-di-cx2" firstAttribute="leading" secondItem="hAL-c1-ngD" secondAttribute="trailing" constant="8" id="bOE-du-YcY"/>
  64.530 +                                                <constraint firstItem="JLc-di-cx2" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="hAL-c1-ngD" secondAttribute="trailing" constant="8" id="bOE-du-YcY"/>
  64.531                                                  <constraint firstItem="hAL-c1-ngD" firstAttribute="centerY" secondItem="Cae-Xt-xQe" secondAttribute="centerY" id="tge-Cp-t5e"/>
  64.532                                                  <constraint firstAttribute="bottom" secondItem="JLc-di-cx2" secondAttribute="bottom" constant="5" id="zc5-ge-u0X"/>
  64.533                                              </constraints>
  64.534                                          </tableViewCellContentView>
  64.535                                      </tableViewCell>
  64.536 -                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="AnE-x4-lic">
  64.537 -                                        <rect key="frame" x="0.0" y="662" width="375" height="44"/>
  64.538 +                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="QDm-IR-T4K">
  64.539 +                                        <rect key="frame" x="0.0" y="724" width="375" height="44"/>
  64.540                                          <autoresizingMask key="autoresizingMask"/>
  64.541 -                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AnE-x4-lic" id="fke-5P-2zb">
  64.542 +                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QDm-IR-T4K" id="axg-1J-Kpy">
  64.543                                              <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
  64.544                                              <autoresizingMask key="autoresizingMask"/>
  64.545                                              <subviews>
  64.546 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RHz-qe-z44">
  64.547 -                                                    <rect key="frame" x="20" y="11.5" width="84" height="21"/>
  64.548 -                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
  64.549 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="azH-be-f3A">
  64.550 +                                                    <rect key="frame" x="20" y="11.5" width="78.5" height="21"/>
  64.551 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.552                                                      <nil key="textColor"/>
  64.553                                                      <nil key="highlightedColor"/>
  64.554                                                  </label>
  64.555 -                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="GoF-g6-pSr">
  64.556 -                                                    <rect key="frame" x="112" y="5" width="243" height="34"/>
  64.557 -                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
  64.558 +                                                <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wBU-1F-ni5" customClass="nonEditMenuUiTextField" customModule="pEpForiOS" customModuleProvider="target">
  64.559 +                                                    <rect key="frame" x="194.5" y="5" width="160.5" height="34"/>
  64.560 +                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
  64.561                                                      <textInputTraits key="textInputTraits"/>
  64.562 +                                                    <connections>
  64.563 +                                                        <outlet property="delegate" destination="a1y-j3-omP" id="rIb-kv-iQU"/>
  64.564 +                                                    </connections>
  64.565                                                  </textField>
  64.566                                              </subviews>
  64.567                                              <constraints>
  64.568 -                                                <constraint firstAttribute="bottom" secondItem="GoF-g6-pSr" secondAttribute="bottom" constant="5" id="5dD-Tz-sKf"/>
  64.569 -                                                <constraint firstItem="GoF-g6-pSr" firstAttribute="leading" secondItem="RHz-qe-z44" secondAttribute="trailing" constant="8" id="DnJ-St-jq7"/>
  64.570 -                                                <constraint firstAttribute="trailing" secondItem="GoF-g6-pSr" secondAttribute="trailing" constant="20" symbolic="YES" id="Krg-Q7-S9q"/>
  64.571 -                                                <constraint firstItem="RHz-qe-z44" firstAttribute="leading" secondItem="fke-5P-2zb" secondAttribute="leading" constant="20" symbolic="YES" id="Ptl-CC-tcd"/>
  64.572 -                                                <constraint firstItem="GoF-g6-pSr" firstAttribute="top" secondItem="fke-5P-2zb" secondAttribute="top" constant="5" id="RMC-6H-ct7"/>
  64.573 -                                                <constraint firstItem="RHz-qe-z44" firstAttribute="centerY" secondItem="fke-5P-2zb" secondAttribute="centerY" id="jzR-JK-TfR"/>
  64.574 +                                                <constraint firstAttribute="bottom" secondItem="wBU-1F-ni5" secondAttribute="bottom" constant="5" id="78r-Hw-03D"/>
  64.575 +                                                <constraint firstItem="wBU-1F-ni5" firstAttribute="top" secondItem="axg-1J-Kpy" secondAttribute="top" constant="5" id="9AK-tT-T21"/>
  64.576 +                                                <constraint firstItem="wBU-1F-ni5" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="azH-be-f3A" secondAttribute="trailing" constant="8" id="9LH-4Z-7Si"/>
  64.577 +                                                <constraint firstItem="azH-be-f3A" firstAttribute="centerY" secondItem="axg-1J-Kpy" secondAttribute="centerY" id="Ibw-XP-gLf"/>
  64.578 +                                                <constraint firstAttribute="trailing" secondItem="wBU-1F-ni5" secondAttribute="trailing" constant="20" symbolic="YES" id="OQY-N3-h5N"/>
  64.579 +                                                <constraint firstItem="azH-be-f3A" firstAttribute="leading" secondItem="axg-1J-Kpy" secondAttribute="leading" constant="20" symbolic="YES" id="pTF-ZU-3pg"/>
  64.580 +                                                <constraint firstItem="wBU-1F-ni5" firstAttribute="width" secondItem="axg-1J-Kpy" secondAttribute="width" multiplier="3:7" priority="750" id="tDE-MN-xJF"/>
  64.581                                              </constraints>
  64.582                                          </tableViewCellContentView>
  64.583                                      </tableViewCell>
  64.584 @@ -785,7 +806,9 @@
  64.585                          <outlet property="imapPortTextfield" destination="ukB-K0-MMG" id="rGA-tC-CYA"/>
  64.586                          <outlet property="imapSecurityTextfield" destination="rCJ-UW-Jmn" id="Vz4-6T-rdl"/>
  64.587                          <outlet property="imapServerTextfield" destination="LOO-6m-Q5O" id="2JT-EB-GaR"/>
  64.588 -                        <outlet property="imapUsernameTextField" destination="20d-ES-uKL" id="Jvy-ZU-ny5"/>
  64.589 +                        <outlet property="imapUsernameTextField" destination="mWn-9q-m8m" id="ovV-c8-dIx"/>
  64.590 +                        <outlet property="keySyncLabel" destination="Tjb-uM-eUF" id="yVW-Vd-sFd"/>
  64.591 +                        <outlet property="keySyncSwitch" destination="zHO-Gd-VWW" id="lbQ-5e-DfG"/>
  64.592                          <outlet property="nameTextfield" destination="RpU-jD-tx7" id="eBg-fx-AAF"/>
  64.593                          <outlet property="oauth2ActivityIndicator" destination="tUA-ey-cn7" id="r97-xz-SfT"/>
  64.594                          <outlet property="oauth2TableViewCell" destination="Bp7-9N-v9r" id="2w0-dL-3iG"/>
  64.595 @@ -796,13 +819,13 @@
  64.596                          <outlet property="smtpPortTextfield" destination="f4i-WV-eyd" id="SWD-86-mCa"/>
  64.597                          <outlet property="smtpSecurityTextfield" destination="JLc-di-cx2" id="sqO-QP-g1u"/>
  64.598                          <outlet property="smtpServerTextfield" destination="fSa-9P-hot" id="sQi-AR-vlO"/>
  64.599 -                        <outlet property="smtpUsernameTextField" destination="GoF-g6-pSr" id="URl-UP-kJm"/>
  64.600 -                        <outlet property="switchKeySync" destination="zHO-Gd-VWW" id="lbQ-5e-DfG"/>
  64.601 +                        <outlet property="smtpUsernameTextField" destination="wBU-1F-ni5" id="OTk-ps-ODB"/>
  64.602 +                        <outlet property="switchKeySyncCell" destination="cDc-tO-miL" id="uf8-Xs-eVk"/>
  64.603                      </connections>
  64.604                  </tableViewController>
  64.605                  <placeholder placeholderIdentifier="IBFirstResponder" id="2Hi-lO-EOj" userLabel="First Responder" sceneMemberID="firstResponder"/>
  64.606              </objects>
  64.607 -            <point key="canvasLocation" x="-1327" y="442"/>
  64.608 +            <point key="canvasLocation" x="-1306" y="-391"/>
  64.609          </scene>
  64.610          <!--Trusted Server Settings View Controller-->