diff --git a/Postbox/Message.swift b/Postbox/Message.swift
index 40d41a466a..16e3951c7a 100644
--- a/Postbox/Message.swift
+++ b/Postbox/Message.swift
@@ -330,7 +330,7 @@ public extension MessageAttribute {
     }
 }
 
-public final class Message {
+public final class Message: CustomStringConvertible {
     public let stableId: UInt32
     public let stableVersion: UInt32
     
@@ -365,6 +365,10 @@ public final class Message {
         self.associatedMessages = associatedMessages
         self.associatedMessageIds = associatedMessageIds
     }
+    
+    public var description: String {
+        return "Message(stableId: \(self.stableId), id: \(self.id), text: \(self.text))"
+    }
 }
 
 public struct StoreMessageFlags: OptionSet {
diff --git a/Postbox/MessageHistoryTable.swift b/Postbox/MessageHistoryTable.swift
index 93ef4e30cf..b26e9a6e20 100644
--- a/Postbox/MessageHistoryTable.swift
+++ b/Postbox/MessageHistoryTable.swift
@@ -215,7 +215,7 @@ final class MessageHistoryTable: Table {
                     processIndexOperationsCommitAccumulatedRemoveIndices(remove: true, peerId: peerId, accumulatedRemoveIndices: &accumulatedRemoveIndices, updatedCombinedState: &updatedCombinedState, invalidateReadState: &invalidateReadState, unsentMessageOperations: &unsentMessageOperations, outputOperations: &outputOperations)
                     
                     if let message = self.justUpdate(index, message: storeMessage, sharedKey: sharedKey, sharedBuffer: sharedBuffer, sharedEncoder: sharedEncoder, unsentMessageOperations: &unsentMessageOperations) {
-                        outputOperations.append(.Remove(accumulatedRemoveIndices))
+                        outputOperations.append(.Remove([index]))
                         outputOperations.append(.InsertMessage(message))
                         
                         if message.flags.contains(.Incoming) {
diff --git a/Postbox/Postbox.swift b/Postbox/Postbox.swift
index 5c134dfdc2..3be0572d2f 100644
--- a/Postbox/Postbox.swift
+++ b/Postbox/Postbox.swift
@@ -419,7 +419,7 @@ public final class Postbox {
             //self.debugRestoreState("afterLogin")
             
             //self.debugSaveState(name: "previous")
-            self.debugRestoreState(name: "previous")
+            //self.debugRestoreState(name: "previous")
             
             //#endif