diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate
index d635ba77eea0b679f0f42c054d297bf364a29f7b..d5c279fb72c4c3be4968081ea06d9dd12f57a6b9 100644
Binary files a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate and b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 8735280309307441ce67efdd35255f7166eb77b8..6ddd3941d716f93d1343a0ee895d950b22973c3d 100644
--- a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -361,8 +361,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "74"
             endingLineNumber = "74"
-            landmarkName = "ContactViewController"
-            landmarkType = "3">
+            landmarkName = "prepareContactSheet()"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -580,11 +580,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528821245.255047"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "434"
-            endingLineNumber = "434"
+            startingLineNumber = "429"
+            endingLineNumber = "429"
             landmarkName = "find(_:type:search:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -596,11 +596,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914411.708531"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "559"
-            endingLineNumber = "559"
+            startingLineNumber = "561"
+            endingLineNumber = "561"
             landmarkName = "getContactByAddress(_:)"
             landmarkType = "7">
             <Locations>
@@ -916,11 +916,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528821245.255047"
+            timestampString = "528986763.289214"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "150"
-            endingLineNumber = "150"
+            startingLineNumber = "142"
+            endingLineNumber = "142"
             landmarkName = "callForFolders(done:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -932,11 +932,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528821245.255047"
+            timestampString = "528986763.289214"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "149"
-            endingLineNumber = "149"
+            startingLineNumber = "141"
+            endingLineNumber = "141"
             landmarkName = "callForFolders(done:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -948,11 +948,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/InboxViewController.swift"
-            timestampString = "528906995.399015"
+            timestampString = "528986763.289214"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "115"
-            endingLineNumber = "115"
+            startingLineNumber = "117"
+            endingLineNumber = "117"
             landmarkName = "numberOfSections(in:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1561,8 +1561,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "174"
             endingLineNumber = "174"
-            landmarkName = "+contentWithTitle:body:videoURL:inputView:buttonText:actionBlock:"
-            landmarkType = "6">
+            landmarkName = "@interface OnboardingContentViewController"
+            landmarkType = "2">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1572,11 +1572,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528821245.255047"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "204"
-            endingLineNumber = "204"
+            startingLineNumber = "189"
+            endingLineNumber = "189"
             landmarkName = "allKeysInFolder(folder:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1604,13 +1604,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "676"
-            endingLineNumber = "676"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "663"
+            endingLineNumber = "663">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1652,13 +1650,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "672"
-            endingLineNumber = "672"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "659"
+            endingLineNumber = "659">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1668,13 +1664,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "750"
-            endingLineNumber = "750"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "737"
+            endingLineNumber = "737">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1732,13 +1726,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "705"
-            endingLineNumber = "705"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "692"
+            endingLineNumber = "692">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1748,13 +1740,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "712"
-            endingLineNumber = "712"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "699"
+            endingLineNumber = "699">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1764,13 +1754,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "704"
-            endingLineNumber = "704"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "691"
+            endingLineNumber = "691">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -3344,13 +3332,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "676"
-            endingLineNumber = "676"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "663"
+            endingLineNumber = "663">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -3392,13 +3378,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "672"
-            endingLineNumber = "672"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "659"
+            endingLineNumber = "659">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -3408,13 +3392,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "744"
-            endingLineNumber = "744"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "731"
+            endingLineNumber = "731">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -3424,13 +3406,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520766559.842034"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "752"
-            endingLineNumber = "752"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "739"
+            endingLineNumber = "739">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -3449,22 +3429,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914411.708531"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "541"
-            endingLineNumber = "541"
-            landmarkName = "getContactByAddress(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4048,13 +4012,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520789313.276257"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "685"
-            endingLineNumber = "685"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "672"
+            endingLineNumber = "672">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -4304,13 +4266,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520844140.607174"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "708"
-            endingLineNumber = "708"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "695"
+            endingLineNumber = "695">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -4352,13 +4312,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/Onboarding.swift"
-            timestampString = "520938073.467233"
+            timestampString = "528989858.707142"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "709"
-            endingLineNumber = "709"
-            landmarkName = "keyHandling()"
-            landmarkType = "7">
+            startingLineNumber = "696"
+            endingLineNumber = "696">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -4496,12 +4454,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "629"
-            endingLineNumber = "629"
-            landmarkName = "decryptText(body:from:autocrypt:)"
+            startingLineNumber = "634"
+            endingLineNumber = "634"
+            landmarkName = "findInlinePGP(text:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -4544,11 +4502,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/SwiftPGP.swift"
-            timestampString = "528802404.131776"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "138"
-            endingLineNumber = "138"
+            startingLineNumber = "151"
+            endingLineNumber = "151"
             landmarkName = "encrypt(plaintext:ids:myId:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4560,11 +4518,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "652"
-            endingLineNumber = "652"
+            startingLineNumber = "657"
+            endingLineNumber = "657"
             landmarkName = "decryptText(body:from:autocrypt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4576,11 +4534,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/SwiftPGP.swift"
-            timestampString = "528802404.131776"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "183"
-            endingLineNumber = "183"
+            startingLineNumber = "196"
+            endingLineNumber = "196"
             landmarkName = "decrypt(data:decryptionId:verifyIds:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4688,27 +4646,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "603"
-            endingLineNumber = "603"
-            landmarkName = "parseMail(_:parser:message:record:folderPath:newMailCallback:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "602"
-            endingLineNumber = "602"
+            startingLineNumber = "607"
+            endingLineNumber = "607"
             landmarkName = "parseMail(_:parser:message:record:folderPath:newMailCallback:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4768,11 +4710,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "641"
-            endingLineNumber = "641"
+            startingLineNumber = "646"
+            endingLineNumber = "646"
             landmarkName = "decryptText(body:from:autocrypt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4800,31 +4742,15 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914411.708531"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "790"
-            endingLineNumber = "790"
+            startingLineNumber = "796"
+            endingLineNumber = "796"
             landmarkName = "folderRecords(folderPath:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528821245.255047"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "130"
-            endingLineNumber = "130"
-            landmarkName = "checkFolder(folderName:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4832,11 +4758,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528821245.255047"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "161"
-            endingLineNumber = "161"
+            startingLineNumber = "152"
+            endingLineNumber = "152"
             landmarkName = "allAddressesInFolder(folder:withoutSecure:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4848,11 +4774,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528821245.255047"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "168"
-            endingLineNumber = "168"
+            startingLineNumber = "153"
+            endingLineNumber = "153"
             landmarkName = "allAddressesInFolder(folder:withoutSecure:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4912,11 +4838,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "733"
-            endingLineNumber = "733"
+            startingLineNumber = "738"
+            endingLineNumber = "738"
             landmarkName = "initFolder(folder:newMailCallback:completionCallback:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4928,11 +4854,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "820"
-            endingLineNumber = "820"
+            startingLineNumber = "824"
+            endingLineNumber = "824"
             landmarkName = "loadMailsSinceDate(folder:since:maxLoad:newMailCallback:completionCallback:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4940,16 +4866,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "715"
-            endingLineNumber = "715"
-            landmarkName = "initFolder(folder:newMailCallback:completionCallback:)"
+            startingLineNumber = "720"
+            endingLineNumber = "720"
+            landmarkName = "allFolders(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -4960,11 +4886,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "722"
-            endingLineNumber = "722"
+            startingLineNumber = "727"
+            endingLineNumber = "727"
             landmarkName = "initFolder(folder:newMailCallback:completionCallback:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4972,17 +4898,17 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "721"
-            endingLineNumber = "721"
-            landmarkName = "initFolder(folder:newMailCallback:completionCallback:)"
-            landmarkType = "7">
+            startingLineNumber = "726"
+            endingLineNumber = "726"
+            landmarkName = "MailHandler"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -4992,12 +4918,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "753"
-            endingLineNumber = "753"
-            landmarkName = "updateFolder(folder:newMailCallback:completionCallback:)"
+            startingLineNumber = "758"
+            endingLineNumber = "758"
+            landmarkName = "initInbox(inbox:newMailCallback:completionCallback:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5008,12 +4934,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528912272.743009"
+            timestampString = "528993411.759768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "742"
-            endingLineNumber = "742"
-            landmarkName = "initInbox(inbox:newMailCallback:completionCallback:)"
+            startingLineNumber = "747"
+            endingLineNumber = "747"
+            landmarkName = "initFolder(folder:newMailCallback:completionCallback:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5040,11 +4966,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528911388.989026"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "221"
-            endingLineNumber = "221"
+            startingLineNumber = "206"
+            endingLineNumber = "206"
             landmarkName = "allMailsInFolder(key:contact:folder:isSecure:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5056,7 +4982,39 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914411.708531"
+            timestampString = "528988815.09281"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "601"
+            endingLineNumber = "601"
+            landmarkName = "handleFromAddress(_:fromMail:autocrypt:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "528988815.09281"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "222"
+            endingLineNumber = "222"
+            landmarkName = "allMailsInFolder(key:contact:folder:isSecure:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "600"
@@ -5065,6 +5023,22 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "528988815.09281"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "531"
+            endingLineNumber = "531"
+            landmarkName = "getContactByAddress(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -5072,12 +5046,92 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528913498.429125"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "237"
-            endingLineNumber = "237"
-            landmarkName = "allMailsInFolder(key:contact:folder:isSecure:)"
+            startingLineNumber = "478"
+            endingLineNumber = "478"
+            landmarkName = "getMailAddress(_:temporary:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "528988815.09281"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "562"
+            endingLineNumber = "562"
+            landmarkName = "getContactByAddress(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "528988815.09281"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "484"
+            endingLineNumber = "484"
+            landmarkName = "getMailAddress(_:temporary:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "528988815.09281"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "603"
+            endingLineNumber = "603"
+            landmarkName = "handleFromAddress(_:fromMail:autocrypt:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
+            timestampString = "528974233.246887"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "165"
+            endingLineNumber = "165"
+            landmarkName = "init(keyID:folder:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
+            timestampString = "528974234.117995"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "169"
+            endingLineNumber = "169"
+            landmarkName = "init(keyID:folder:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5088,11 +5142,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914411.708531"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "611"
-            endingLineNumber = "611"
+            startingLineNumber = "617"
+            endingLineNumber = "617"
             landmarkName = "handleFromAddress(_:fromMail:autocrypt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5104,15 +5158,31 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914411.708531"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "599"
-            endingLineNumber = "599"
+            startingLineNumber = "613"
+            endingLineNumber = "613"
             landmarkName = "handleFromAddress(_:fromMail:autocrypt:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "528988815.09281"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "419"
+            endingLineNumber = "419"
+            landmarkName = "find(_:type:search:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -5120,11 +5190,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914411.708531"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "606"
-            endingLineNumber = "606"
+            startingLineNumber = "614"
+            endingLineNumber = "614"
             landmarkName = "handleFromAddress(_:fromMail:autocrypt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5132,16 +5202,48 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/AppDelegate.swift"
+            timestampString = "528982424.407093"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "25"
+            endingLineNumber = "25"
+            landmarkName = "application(_:didFinishLaunchingWithOptions:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/AppDelegate.swift"
+            timestampString = "528984291.415456"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "114"
+            endingLineNumber = "114"
+            landmarkName = "setupKeys()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914389.534339"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "535"
-            endingLineNumber = "535"
-            landmarkName = "getContactByAddress(_:)"
+            startingLineNumber = "394"
+            endingLineNumber = "394"
+            landmarkName = "findSecretKeys()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5152,12 +5254,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914478.970465"
+            timestampString = "528988815.09281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "483"
-            endingLineNumber = "483"
-            landmarkName = "getMailAddress(_:temporary:)"
+            startingLineNumber = "356"
+            endingLineNumber = "356"
+            landmarkName = "createNewSecretKey(adr:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5167,14 +5269,46 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914484.858294"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/AppDelegate.swift"
+            timestampString = "528984291.415456"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "560"
-            endingLineNumber = "560"
-            landmarkName = "getContactByAddress(_:)"
+            startingLineNumber = "111"
+            endingLineNumber = "111"
+            landmarkName = "setupKeys()"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "enzevalos_iphone.AppDelegate.setupKeys () -&gt; ()"
+                  moduleName = "enzevalos_iphone"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/enzevalos_iphone/AppDelegate.swift"
+                  timestampString = "528993582.913896"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "111"
+                  endingLineNumber = "111"
+                  offsetFromSymbolStart = "362">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "enzevalos_iphone.AppDelegate.(setupKeys () -&gt; ()).(closure #1)"
+                  moduleName = "enzevalos_iphone"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/enzevalos_iphone/AppDelegate.swift"
+                  timestampString = "528993582.91528"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "111"
+                  endingLineNumber = "111"
+                  offsetFromSymbolStart = "35">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5183,13 +5317,45 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "528914550.639906"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
+            timestampString = "528993515.252097"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "489"
-            endingLineNumber = "489"
-            landmarkName = "getMailAddress(_:temporary:)"
+            startingLineNumber = "620"
+            endingLineNumber = "620"
+            landmarkName = "parseMail(_:parser:message:record:folderPath:newMailCallback:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
+            timestampString = "528993570.759665"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "567"
+            endingLineNumber = "567"
+            landmarkName = "parseMail(_:parser:message:record:folderPath:newMailCallback:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
+            timestampString = "528993572.890123"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "573"
+            endingLineNumber = "573"
+            landmarkName = "parseMail(_:parser:message:record:folderPath:newMailCallback:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>