diff --git a/lib/installer-exclude/irc-api-1.0-sources.jar b/lib/installer-exclude/irc-api-1.0-sources.jar
index 0b83a9eb2..363fa8f2f 100644
Binary files a/lib/installer-exclude/irc-api-1.0-sources.jar and b/lib/installer-exclude/irc-api-1.0-sources.jar differ
diff --git a/lib/installer-exclude/irc-api-1.0.jar b/lib/installer-exclude/irc-api-1.0.jar
index edbb508a6..0ce74b2f7 100644
Binary files a/lib/installer-exclude/irc-api-1.0.jar and b/lib/installer-exclude/irc-api-1.0.jar differ
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
index 1c9478ecd..eac212e72 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
@@ -148,13 +148,23 @@ public void connect(String host, int port, String password,
         // Make sure we start with an empty joined-channel list.
         this.joining.clear();
         this.joined.clear();
+        
+        final IRCServer server;
+        if (secureConnection)
+        {
+            server =
+                new SecureIRCServer(host, port, password,
+                    getCustomSSLContext(host));
+        }
+        else
+        {
+            server = new IRCServer(host, port, password, false);
+        }
 
         this.irc = new IRCApiImpl(true);
         synchronized (this.irc)
         {
-            this.params.setServer(new IRCServer(host, port, password,
-                secureConnection));
-            this.params.setCustomContext(getCustomSSLContext(host));
+            this.params.setServer(server);
             this.irc.addListener(new ServerListener());
             connectSynchronized();
         }
@@ -1703,11 +1713,6 @@ private static class ServerParameters
          */
         private IRCServer server;
         
-        /**
-         * Custom SSL Context.
-         */
-        private SSLContext sslContext = null;
-
         /**
          * Construct ServerParameters instance.
          * @param nickName nick name
@@ -1830,30 +1835,6 @@ public void setServer(IRCServer server)
             
             this.server = server;
         }
-        
-        /**
-         * Get the SSL Context.
-         * 
-         * Returns the custom SSLContext or null in case there is no
-         * custom implementation.
-         * 
-         * @return returns the SSLContext or null
-         */
-        @Override
-        public SSLContext getCustomContext()
-        {
-            return this.sslContext;
-        }
-        
-        /**
-         * Set custom SSLContext.
-         * 
-         * @param context the custom SSLContext
-         */
-        public void setCustomContext(SSLContext context)
-        {
-            this.sslContext = context;
-        }
     }
 
     /**