 +  cancelled: false
 +};
 +
-+function imMessage(aPrplMessage) {
-+  this.prplMessage = aPrplMessage;
-+}
-+imMessage.prototype = {
-+  __proto__: ClassInfo(["imIMessage", "prplIMessage"], "IM Message"),
-+  cancelled: false,
-+  _displayMessage: null,
-+
-+  get displayMessage() {
-+    return this._displayMessage || this.prplMessage.originalMessage;
-+  },
-+  set displayMessage(aMsg) { this._displayMessage = aMsg; },
-+
-+  get message() this.prplMessage.message,
-+  set message(aMsg) { this.prplMessage.message = aMsg; },
-+
-+  // from prplIMessage
-+  get who() this.prplMessage.who,
-+  get time() this.prplMessage.time,
-+  get id() this.prplMessage.id,
-+  get alias() this.prplMessage.alias,
-+  get iconURL() this.prplMessage.iconURL,
-+  get conversation() this.prplMessage.conversation,
-+  set conversation(aConv) { this.prplMessage.conversation = aConv; },
-+  get color() this.prplMessage.color,
-+  get outgoing() this.prplMessage.outgoing,
-+  get incoming() this.prplMessage.incoming,
-+  get system() this.prplMessage.system,
-+  get autoResponse() this.prplMessage.autoResponse,
-+  get containsNick() this.prplMessage.containsNick,
-+  get noLog() this.prplMessage.noLog,
-+  get error() this.prplMessage.error,
-+  get delayed() this.prplMessage.delayed,
-+  get noFormat() this.prplMessage.noFormat,
-+  get containsImages() this.prplMessage.containsImages,
-+  get notification() this.prplMessage.notification,
-+  get noLinkification() this.prplMessage.noLinkification,
-+  getActions: function(aCount) this.prplMessage.getActions(aCount)
-+};
-+
  function UIConversation(aPrplConversation)
  {
    this._prplConv = {};

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


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;
