diff --git a/converse.js b/converse.js
index b2efdc771..f443c5312 100644
--- a/converse.js
+++ b/converse.js
@@ -2906,7 +2906,7 @@
                 var contact_jid, $forwarded, $received, $sent,
                     msgid = $message.attr('id'),
                     chatbox, resource, roster_item,
-                    message_from = $message.attr('from');
+                    message_from = $message.attr('from').toLowerCase();
                 if (message_from === converse.connection.jid) {
                     // FIXME: Forwarded messages should be sent to specific resources,
                     // not broadcasted
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 4b5936a9f..e1bc07431 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.8.4 (Unreleased)
+------------------
+
+* #234 Cannot send/receive messages when contact JIDs have mixed case. [jcbrand]
+
 0.8.4 (2014-11-15)
 ------------------