diff --git a/lib/installer-exclude/ymsg_network_v0_61.jar b/lib/installer-exclude/ymsg_network_v0_61.jar
index 993fab621..fd40feef5 100644
Binary files a/lib/installer-exclude/ymsg_network_v0_61.jar and b/lib/installer-exclude/ymsg_network_v0_61.jar differ
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
index f961cf486..9b74f3f14 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
@@ -14,6 +14,7 @@
 import net.java.sip.communicator.service.protocol.yahooconstants.*;
 import net.java.sip.communicator.util.*;
 
+import ymsg.support.*;
 import ymsg.network.*;
 import ymsg.network.event.*;
 
@@ -128,15 +129,19 @@ public Message createMessage(byte[] content, String contentType,
 
     /**
      * Create a Message instance for sending a simple text messages with
-     * default (text/plain) content type and encoding.
-     *
+     * default (html) content type and encoding.
+     * As no indications in the protocol is it html or not. No harm
+     * to set all messages html - doesn't affect the appearance of the gui
+     * 
      * @param messageText the string content of the message.
      * @return Message the newly created message
      */
     public Message createMessage(String messageText)
     {
-        return new MessageYahooImpl(messageText, DEFAULT_MIME_TYPE
-                                  , DEFAULT_MIME_ENCODING, null);
+        return new MessageYahooImpl(
+            new MessageDecoder().decodeToHTML(messageText), 
+            "html", 
+            DEFAULT_MIME_ENCODING, null);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
index 523e8d4a5..453478b7f 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
@@ -6,6 +6,7 @@ Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
  javax.net.ssl,
  javax.swing,
+ javax.swing.text,
  javax.xml.parsers,
  javax.naming,
  javax.naming.directory,