diff --git a/Pods/Pods.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist
index 5ac137429ea3c3deb71d450adf8948deff868acb..85a8ea942e09ba9b755b1cca0f156c684b7b150a 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Pods/Pods.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -8,41 +8,57 @@
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>0</integer>
 		</dict>
 		<key>FrameAccessor.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>1</integer>
 		</dict>
 		<key>KeychainAccess.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>2</integer>
 		</dict>
 		<key>Onboard.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>3</integer>
 		</dict>
 		<key>Pods-enzevalos_iphone.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>4</integer>
 		</dict>
 		<key>Pods-enzevalos_iphoneTests.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>5</integer>
 		</dict>
 		<key>Pods-enzevalos_iphoneUITests.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>6</integer>
 		</dict>
 		<key>VENTokenField.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>7</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate
index ed7ca96bc0239f27b19e3239456ad39fcae3652d..674f90c08847280a18c49cf412beb0bc3870a875 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 f479b5866ea76771c65c3fbac92ac7797ec257b1..6aa3cf2481e34d43b84d843596b761e73c125bc7 100644
--- a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -613,7 +613,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "356"
             endingLineNumber = "356"
-            landmarkName = "handleFromAddress(_:fromMail:autocrypt:)"
+            landmarkName = "getContactByMCOAddress(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -629,7 +629,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "482"
             endingLineNumber = "482"
-            landmarkName = "addToRecords(_:records:)"
+            landmarkName = "createMail(_:sender:receivers:cc:time:received:subject:body:flags:record:autocrypt:decryptedData:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -752,11 +752,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "234"
-            endingLineNumber = "234"
+            startingLineNumber = "229"
+            endingLineNumber = "229"
             landmarkName = "decryptedMime(_:from:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -768,11 +768,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "214"
-            endingLineNumber = "214"
+            startingLineNumber = "209"
+            endingLineNumber = "209"
             landmarkName = "decryptedMime(_:from:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -947,7 +947,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "91"
             endingLineNumber = "91"
-            landmarkName = "init()"
+            landmarkName = "cleanCache()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -963,7 +963,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "90"
             endingLineNumber = "90"
-            landmarkName = "init()"
+            landmarkName = "cleanCache()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1390,11 +1390,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "559"
-            endingLineNumber = "559"
+            startingLineNumber = "554"
+            endingLineNumber = "554"
             landmarkName = "PGPEncryption"
             landmarkType = "3">
          </BreakpointContent>
@@ -1603,8 +1603,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "131"
             endingLineNumber = "131"
-            landmarkName = "removeAll(entity:)"
-            landmarkType = "7">
+            landmarkName = "DataHandler"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1614,11 +1614,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "578"
-            endingLineNumber = "578"
+            startingLineNumber = "573"
+            endingLineNumber = "573"
             landmarkName = "getMaxIndex(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2510,11 +2510,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "479"
-            endingLineNumber = "479"
+            startingLineNumber = "474"
+            endingLineNumber = "474"
             landmarkName = "signAndEncrypt(_:keyIDs:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2638,7 +2638,7 @@
                   moduleName = "enzevalos_iphone"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/ObjectivePGP.m"
-                  timestampString = "520545280.575062"
+                  timestampString = "520546675.633841"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "731"
@@ -2653,7 +2653,7 @@
                   moduleName = "enzevalos_iphone"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/ObjectivePGP.m"
-                  timestampString = "520545280.576438"
+                  timestampString = "520546675.63525"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "731"
@@ -2794,27 +2794,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542065.042756"
+            timestampString = "520546363.456691"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "53"
-            endingLineNumber = "53"
-            landmarkName = "generateKey(name:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "77"
-            endingLineNumber = "77"
+            startingLineNumber = "71"
+            endingLineNumber = "71"
             landmarkName = "generateKey(name:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2826,11 +2810,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546363.456691"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "74"
-            endingLineNumber = "74"
+            startingLineNumber = "68"
+            endingLineNumber = "68"
             landmarkName = "generateKey(name:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2842,11 +2826,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546363.456691"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "76"
-            endingLineNumber = "76"
+            startingLineNumber = "70"
+            endingLineNumber = "70"
             landmarkName = "generateKey(name:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2858,11 +2842,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542065.042756"
+            timestampString = "520546363.456691"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "57"
-            endingLineNumber = "57"
+            startingLineNumber = "53"
+            endingLineNumber = "53"
             landmarkName = "generateKey(name:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3082,11 +3066,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "515"
-            endingLineNumber = "515"
+            startingLineNumber = "510"
+            endingLineNumber = "510"
             landmarkName = "signAndEncrypt(_:mailaddresses:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3098,11 +3082,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "481"
-            endingLineNumber = "481"
+            startingLineNumber = "476"
+            endingLineNumber = "476"
             landmarkName = "signAndEncrypt(_:keyIDs:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3114,11 +3098,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "474"
-            endingLineNumber = "474"
+            startingLineNumber = "469"
+            endingLineNumber = "469"
             landmarkName = "signAndEncrypt(_:keyIDs:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3130,11 +3114,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546363.456691"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "92"
-            endingLineNumber = "92"
+            startingLineNumber = "86"
+            endingLineNumber = "86"
             landmarkName = "generateKey(name:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3146,11 +3130,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542065.042756"
+            timestampString = "520546363.456691"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "58"
-            endingLineNumber = "58"
+            startingLineNumber = "55"
+            endingLineNumber = "55"
             landmarkName = "generateKey(name:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3162,11 +3146,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546674.291916"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "534"
-            endingLineNumber = "534"
+            startingLineNumber = "529"
+            endingLineNumber = "529"
             landmarkName = "addKey(_:forMailAddresses:discoveryMailUID:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3242,7 +3226,7 @@
                   moduleName = "enzevalos_iphone"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/PGPKey.m"
-                  timestampString = "520545280.607399"
+                  timestampString = "520546675.665074"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "224"
@@ -3257,7 +3241,7 @@
                   moduleName = "enzevalos_iphone"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/PGPKey.m"
-                  timestampString = "520545280.608705"
+                  timestampString = "520546675.666404"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "224"
@@ -3446,7 +3430,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
@@ -3658,11 +3642,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
-            timestampString = "520542983.513291"
+            timestampString = "520546363.456691"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "66"
-            endingLineNumber = "66"
+            startingLineNumber = "60"
+            endingLineNumber = "60"
             landmarkName = "generateKey(name:)"
             landmarkType = "7">
          </BreakpointContent>