From e60dcf4f63c0e41a8712a4ce7bdf828ff8780d92 Mon Sep 17 00:00:00 2001
From: Danny van Heumen <danny@dannyvanheumen.nl>
Date: Wed, 14 Jan 2015 23:02:11 +0100
Subject: [PATCH] IRC: use content type and encoding from transformed message

---
 .../irc/OperationSetBasicInstantMessagingIrcImpl.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/irc/OperationSetBasicInstantMessagingIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/OperationSetBasicInstantMessagingIrcImpl.java
index ca22ca9e8..9f33ca824 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/OperationSetBasicInstantMessagingIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/OperationSetBasicInstantMessagingIrcImpl.java
@@ -120,15 +120,14 @@ public void sendInstantMessage(final Contact to, final Message original)
                     continue;
                 }
 
-                String transformedContent =
-                    event.getSourceMessage().getContent();
+                final Message transformed = event.getSourceMessage();
 
                 // Note: can't set subject since it leaks information while
                 // message content actually did get encrypted.
-                // FIXME should get contentType and contentEncoding from
-                // transformed messages, just in case
-                MessageIrcImpl message = this.createMessage(transformedContent,
-                    original.getContentType(), original.getEncoding(), "");
+                MessageIrcImpl message =
+                    this.createMessage(transformed.getContent(),
+                        transformed.getContentType(),
+                        transformed.getEncoding(), "");
 
                 try
                 {