1 files changed, 7 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
index 52b3d83..07a0a0e 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
@@ -12,6 +12,7 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.Message;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
+import net.kano.joscar.*;
 import net.kano.joscar.flapcmd.*;
 import net.kano.joscar.snac.*;
 import net.kano.joscar.snaccmd.error.*;
@@ -402,7 +403,12 @@ public class OperationSetBasicInstantMessagingIcqImpl
 
                 if(icqProvider.USING_ICQ)
                     retreiveOfflineMessages();
-
+                
+                String customMessageEncoding = null;
+                if((customMessageEncoding = 
+                    System.getProperty("icq.custom.message.charset")) != null)
+                    OscarTools.setDefaultCharset(customMessageEncoding);
+                
                 // run keepalive thread
                 if(keepAliveSendTask == null)
                 {