diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate
index 9534e415057323bd793a94b8b8a8c1a021638929..352ae525244266c2c15be0da911a9c184cf33c27 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 e9ddb12187b7e57eb675e5d0660a629b952bf7c4..aac18d12edbf4b767d1d3358091ee6560442d6a5 100644
--- a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -563,7 +563,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "252"
             endingLineNumber = "252"
-            landmarkName = "setUItoMail()"
+            landmarkName = "archiveButton(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -944,7 +944,9 @@
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "111"
-            endingLineNumber = "111">
+            endingLineNumber = "111"
+            landmarkName = "numberOfSections(in:)"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -3769,7 +3771,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "255"
             endingLineNumber = "255"
-            landmarkName = "setUItoMail()"
+            landmarkName = "archiveButton(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -4516,11 +4518,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528399040.569769"
+            timestampString = "528801359.301725"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "790"
-            endingLineNumber = "790"
+            startingLineNumber = "775"
+            endingLineNumber = "775"
             landmarkName = "getUIDs(for:callback:)"
             landmarkType = "7">
             <Locations>
@@ -4579,11 +4581,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528399040.569769"
+            timestampString = "528801359.301725"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "808"
-            endingLineNumber = "808"
+            startingLineNumber = "793"
+            endingLineNumber = "793"
             landmarkName = "getUIDs(for:callback:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4627,27 +4629,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528399040.569769"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "645"
-            endingLineNumber = "645"
-            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 = "528399040.569769"
+            timestampString = "528801359.301725"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "703"
-            endingLineNumber = "703"
+            startingLineNumber = "691"
+            endingLineNumber = "691"
             landmarkName = "decryptText(body:from:autocrypt:)"
             landmarkType = "7">
             <Locations>
@@ -4707,11 +4693,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528399040.569769"
+            timestampString = "528801359.301725"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "729"
-            endingLineNumber = "729"
+            startingLineNumber = "714"
+            endingLineNumber = "714"
             landmarkName = "decryptText(body:from:autocrypt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4748,22 +4734,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528399040.569769"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "708"
-            endingLineNumber = "708"
-            landmarkName = "decryptText(body:from:autocrypt:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4851,11 +4821,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528399075.269282"
+            timestampString = "528801359.301725"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "678"
-            endingLineNumber = "678"
+            startingLineNumber = "667"
+            endingLineNumber = "667"
             landmarkName = "parseMail(_:parser:message:record:folderPath:newMailCallback:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4867,11 +4837,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "528399076.589075"
+            timestampString = "528801359.301725"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "677"
-            endingLineNumber = "677"
+            startingLineNumber = "666"
+            endingLineNumber = "666"
             landmarkName = "parseMail(_:parser:message:record:folderPath:newMailCallback:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4879,7 +4849,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/ObjectivePGP/ObjectivePGPObject.m"
@@ -4924,18 +4894,50 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
+            timestampString = "528801359.301725"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "578"
+            endingLineNumber = "578"
+            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 = "528801331.424437"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "703"
+            endingLineNumber = "703"
+            landmarkName = "decryptText(body:from:autocrypt:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/SwiftPGP.swift"
-            timestampString = "528402289.996508"
+            timestampString = "528801391.933681"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "69"
-            endingLineNumber = "69"
+            startingLineNumber = "70"
+            endingLineNumber = "70"
             landmarkName = "importKeys(key:isSecretKey:autocrypt:)"
             landmarkType = "7">
          </BreakpointContent>