 # User Arlo Breault <arlolra@gmail.com>
 # Date 1409207291 25200
 #      Wed Aug 27 23:28:11 2014 -0700
-# Node ID 0ce7ef712c12473341cb492bba3d0d0d9da1b727
+# Node ID 35b6b091c351165d4a7a21e468d5afe6842efb14
 # Parent  f54bd01f595b76e980d6661b7316fd8738b10119
 An API to support OTR-like protocols in Instantbird
 

       this.target = this._prplConv[aTargetId];
+
+    if (aTopic == "new-text") {
+      aSubject = new imMessage(aSubject);
+      this.notifyObservers(aSubject, "received-message");
+      if (aSubject.cancelled)
+        return;

diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js
--- a/chat/components/src/imConversations.js
+++ b/chat/components/src/imConversations.js
@@ -10,16 +10,25 @@ Cu.import("resource:///modules/jsProtoHe
 
 var gLastUIConvId = 0;
 var gLastPrplConvId = 0;
