From 0916cc6119c9d759cd6625c25ed63322d6899f3d Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <rasom@ukr.net>
Date: Thu, 1 Dec 2016 17:32:11 +0200
Subject: [PATCH] fix #528

---
 src/status_im/chat/handlers.cljs | 4 +++-
 src/status_im/handlers.cljs      | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/status_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs
index 2badf08a28..cdb36f84b7 100644
--- a/src/status_im/chat/handlers.cljs
+++ b/src/status_im/chat/handlers.cljs
@@ -273,7 +273,9 @@
 (defn init-chat
   ([db] (init-chat db nil))
   ([{:keys [messages current-chat-id] :as db} _]
-   (assoc-in db [:chats current-chat-id :messages] messages)))
+   (-> db
+       (assoc-in [:chats current-chat-id :messages] messages)
+       (dissoc :messages))))
 
 (defn load-commands!
   [{:keys [current-chat-id]}]
diff --git a/src/status_im/handlers.cljs b/src/status_im/handlers.cljs
index fe8c494b20..e4f67196cf 100644
--- a/src/status_im/handlers.cljs
+++ b/src/status_im/handlers.cljs
@@ -56,8 +56,12 @@
 
 (register-handler :initialize-account-db
   (fn [db _]
-    (assoc db :current-chat-id console-chat-id
-              :edit-mode nil)))
+    (-> db
+        (assoc :current-chat-id console-chat-id)
+        (dissoc :edit-mode
+                :transactions
+                :transactions-queue
+                :new-contact-identity))))
 
 (register-handler :initialize-account
   (u/side-effect!