diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index 46f80444f..1f200743a 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -25,6 +25,8 @@
 - #592 Add random resource for `auto_login`, add method generateResource to generate random resource [davec82]
 - #598 Add option `synchronize_availability` [davec82]
 - #600 Fix change xmpp status also on icon-status click [davec82]
+- #616 converse-otr should depend on converse-minimize  [jcbrand]
+- #609 Remove split of fullname [lixmal]
 
 ## 0.10.1 (2016-02-06)
 
diff --git a/src/converse-core.js b/src/converse-core.js
index c56dbc764..2bbf98df4 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -1241,7 +1241,9 @@
                 } else {
                     from = Strophe.getBareJidFromJid($message.attr('from'));
                 }
-                fullname = (_.isEmpty(fullname) ? from: fullname).split(' ')[0];
+                if (_.isEmpty(fullname)) {
+                    fullname = from;
+                }
                 if (delayed) {
                     stamp = $delay.attr('stamp');
                     time = stamp;