diff --git a/Postbox/Postbox.swift b/Postbox/Postbox.swift
index 0a96e09511..6fbc9a620d 100644
--- a/Postbox/Postbox.swift
+++ b/Postbox/Postbox.swift
@@ -373,13 +373,19 @@ public final class Postbox<State: PostboxState> {
         return result
     }
     
-    public func setKeychainEntry(key: String, value: NSData) {
+    public func setKeychainEntryForKey(key: String, value: NSData) {
         self.queue.dispatch {
             let keyBlob = Blob(data: key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: true)!)
             self.database.prepareCached("INSERT OR REPLACE INTO keychain (key, data) VALUES (?, ?)").run(keyBlob, Blob(data: value))
         }
     }
     
+    public func removeKeychainEntryForKey(key: String) {
+        self.queue.dispatch {
+            self.database.prepareCached("DELETE FROM keychain WHERE key = ?").run(keyBlob)
+        }
+    }
+    
     private func addMessages(messages: [Message], medias: [Media]) {
         let messageInsertStatement = self.database.prepare("INSERT INTO peer_messages (peerId, namespace, id, data, associatedMediaIds, timestamp) VALUES (?, ?, ?, ?, ?, ?)")
         let peerMediaInsertStatement = self.database.prepare("INSERT INTO peer_media (peerId, mediaNamespace, messageNamespace, messageId) VALUES (?, ?, ?, ?)")