From 06f4d4456d56b6f02b055718f4502f98210669e6 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Fri, 20 Mar 2015 10:47:58 -0700
Subject: [PATCH] Fix empty notification on key conflicts

---
 js/models/messages.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/models/messages.js b/js/models/messages.js
index 1d76cf36a..4046d259d 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -50,6 +50,9 @@
             if (this.isEndSession()) {
                 return 'Secure session ended';
             }
+            if (this.isIncoming() && this.hasKeyConflicts()) {
+                return 'Received message with unknown identity key.';
+            }
 
             return this.get('body');
         },