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 52b3d83f2..07a0a0edf 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.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 void registrationStateChanged(RegistrationStateChangeEvent evt)
 
                 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)
                 {
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
index 4d2f1d8f3..cd0817634 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
@@ -417,6 +417,14 @@ public void postTestSubscribe()
             // remove it
             operationSetPresence1.unsubscribe(subEvt.getSourceContact());
             
+            // wait remove to be finished
+            Object lock = new Object();
+            synchronized(lock){
+                try{
+                    lock.wait(3000);
+                }catch (Exception e){}
+            }
+            
             // add it
             operationSetPresence1.addSubsciptionListener(subEvtCollector);
             subEvtCollector.collectedEvents.clear();