diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate
index c5c2c80377c90fab244355a1ea2a3d3d07c45bef..3e9426e0d887c7392e8661deafc31cbab182f45d 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 9ab0fe039515d46218b20614ba95e4c789e3cb5b..9f70fe8a9d539cdf0d217961dbec13ad652a6733 100644
--- a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -140,7 +140,9 @@
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "190"
-            endingLineNumber = "190">
+            endingLineNumber = "190"
+            landmarkName = "getSubjectWithFlagsString()"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -326,11 +328,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
-            timestampString = "507140419.705835"
+            timestampString = "508860772.406088"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "206"
-            endingLineNumber = "206">
+            startingLineNumber = "226"
+            endingLineNumber = "226">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -340,12 +342,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
-            timestampString = "507140419.705835"
+            timestampString = "508860772.406088"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "114"
-            endingLineNumber = "114"
-            landmarkName = "addNewMail(mail:)"
+            startingLineNumber = "135"
+            endingLineNumber = "135"
+            landmarkName = "addNewMail(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -638,13 +640,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "508350775.931514"
+            timestampString = "508352046.915824"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "353"
-            endingLineNumber = "353"
-            landmarkName = "createMail(uid:sender:receivers:cc:time:received:subject:body:flags:)"
-            landmarkType = "9">
+            startingLineNumber = "345"
+            endingLineNumber = "345"
+            landmarkName = "createMail(_:sender:receivers:cc:time:received:subject:body:flags:)"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -654,11 +656,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "508351417.443711"
+            timestampString = "508859494.612839"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "457"
-            endingLineNumber = "457">
+            startingLineNumber = "469"
+            endingLineNumber = "469">
             <Locations>
                <Location
                   shouldBeEnabled = "No"
@@ -726,7 +728,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/AddressHandler.swift"
@@ -739,37 +741,69 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  shouldBeEnabled = "Yes"
+                  shouldBeEnabled = "No"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "static enzevalos_iphone.AddressHandler.contactByEmail (Swift.Array&lt;enzevalos_iphone.MailAddress&gt;) -&gt; Swift.Array&lt;__ObjC.CNContact&gt;"
                   moduleName = "enzevalos_iphone"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/enzevalos_iphone/AddressHandler.swift"
-                  timestampString = "508349296.797089"
+                  timestampString = "508858837.933072"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "206"
                   endingLineNumber = "206"
-                  offsetFromSymbolStart = "72">
+                  offsetFromSymbolStart = "64">
                </Location>
                <Location
-                  shouldBeEnabled = "Yes"
+                  shouldBeEnabled = "No"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
                   symbolName = "static enzevalos_iphone.AddressHandler.(contactByEmail (Swift.Array&lt;enzevalos_iphone.MailAddress&gt;) -&gt; Swift.Array&lt;__ObjC.CNContact&gt;).(closure #1)"
                   moduleName = "enzevalos_iphone"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/enzevalos_iphone/AddressHandler.swift"
-                  timestampString = "508349296.798779"
+                  timestampString = "508858837.934963"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "207"
                   endingLineNumber = "207"
-                  offsetFromSymbolStart = "48">
+                  offsetFromSymbolStart = "56">
                </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "508859494.612839"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "433"
+            endingLineNumber = "433"
+            landmarkName = "getRecords()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "508859494.612839"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "425"
+            endingLineNumber = "425"
+            landmarkName = "getRecords()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>