diff --git a/Postbox.xcodeproj/project.pbxproj b/Postbox.xcodeproj/project.pbxproj
index 7e79322d81..e03c7a157f 100644
--- a/Postbox.xcodeproj/project.pbxproj
+++ b/Postbox.xcodeproj/project.pbxproj
@@ -1573,6 +1573,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
+				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = PostboxMac/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
@@ -1705,6 +1706,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
+				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = PostboxMac/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
diff --git a/Postbox/MessageHistoryView.swift b/Postbox/MessageHistoryView.swift
index 7291ffd396..d08ab6ff31 100644
--- a/Postbox/MessageHistoryView.swift
+++ b/Postbox/MessageHistoryView.swift
@@ -1442,7 +1442,7 @@ public final class MessageHistoryView {
             }
             if let groupStart = groupStart, laterId != nil {
                 entries.removeSubrange(groupStart.0 ..< entries.count)
-                laterId = nil
+               // laterId = nil
             }
             
             groupStart = nil
@@ -1471,7 +1471,7 @@ public final class MessageHistoryView {
             }
             if let groupStart = groupStart, earlierId != nil {
                 entries.removeSubrange(0 ..< groupStart.0 + 1)
-                earlierId = nil
+                //earlierId = nil
             }
         }
         self.entries = entries