1 files changed, 4 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/plugin/otr/OtrTransformLayer.java b/src/net/java/sip/communicator/plugin/otr/OtrTransformLayer.java
index 5111d9e..44e0f0e 100644
--- a/src/net/java/sip/communicator/plugin/otr/OtrTransformLayer.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrTransformLayer.java
@@ -139,12 +139,14 @@ public class OtrTransformLayer
             contact.getProtocolProvider().getOperationSet(
                 OperationSetBasicInstantMessaging.class);
         Message processedMessage =
-            imOpSet.createMessage(processedMessageContent);
+            imOpSet.createMessageWithUID(
+                processedMessageContent, evt.getSourceMessage().getMessageUID());
 
         // Create a new event and return.
         MessageReceivedEvent processedEvent =
             new MessageReceivedEvent(processedMessage, contact, evt
-                .getTimestamp());
+                .getContactResource(), evt.getTimestamp(),
+                evt.getCorrectedMessageUID());
 
         return processedEvent;
     }