diff --git a/lib/installer-exclude/joscar-client.jar b/lib/installer-exclude/joscar-client.jar
index f548254df..76830d9f7 100644
Binary files a/lib/installer-exclude/joscar-client.jar and b/lib/installer-exclude/joscar-client.jar differ
diff --git a/lib/installer-exclude/joscar-common.jar b/lib/installer-exclude/joscar-common.jar
index ea62756cf..e5f8bade8 100644
Binary files a/lib/installer-exclude/joscar-common.jar and b/lib/installer-exclude/joscar-common.jar differ
diff --git a/lib/installer-exclude/joscar-protocol.jar b/lib/installer-exclude/joscar-protocol.jar
index 0df80bf07..09c1e3659 100644
Binary files a/lib/installer-exclude/joscar-protocol.jar and b/lib/installer-exclude/joscar-protocol.jar differ
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
index 11095db45..41c8fe4be 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
@@ -132,32 +132,7 @@ public void handleEventWithStateChange(
                 // this both are hacks that detects cancels while transfering
                 // as only connection is closed from other side
                 // we detect it by receiving ConnectionTimedOutEvent
-                if(transfer instanceof IncomingFileTransferImpl)
-                {
-                    ((IncomingFileTransferImpl)transfer).getStateController().
-                        addControllerListener(new ControllerListener()
-                    {
-
-                        public void handleControllerSucceeded(
-                            StateController controller, SuccessfulStateInfo info)
-                        {
-                        }
-
-                        public void handleControllerFailed(
-                            StateController controller, FailedStateInfo info)
-                        {
-                            if(info instanceof FailureEventInfo
-                                && ((FailureEventInfo)info).getEvent()
-                                    instanceof ConnectionTimedOutEvent)
-                            {
-                                FileTransferImpl.this.fireStatusChangeEvent(
-                                    FileTransferStatusChangeEvent.CANCELED);
-                                fileTransfer.close();
-                            }
-                        }
-                    });
-                }
-                else if(transfer instanceof OutgoingFileTransferImpl)
+                if(transfer instanceof OutgoingFileTransferImpl)
                 {
                     ((OutgoingFileTransferImpl)transfer).getStateController().
                         addControllerListener(new ControllerListener()
@@ -198,8 +173,14 @@ else if(event instanceof BuddyCancelledEvent)
                 {
                     fireStatusChangeEvent(FileTransferStatusChangeEvent.CANCELED);
                 }
+                else if(event instanceof UnknownErrorEvent)
+                {
+                    fireStatusChangeEvent(FileTransferStatusChangeEvent.CANCELED);
+                }
                 else
+                {
                     fireStatusChangeEvent(FileTransferStatusChangeEvent.FAILED);
+                }
             }
             else if (state==FileTransferState.TRANSFERRING)
             {