Index: /trunk/roundcubemail/index.php
===================================================================
--- /trunk/roundcubemail/index.php	(revision 881)
+++ /trunk/roundcubemail/index.php	(revision 882)
@@ -3,5 +3,5 @@
  +-----------------------------------------------------------------------+
  | RoundCube Webmail IMAP Client                                         |
- | Version 0.1-20070809                                                  |
+ | Version 0.1-20071017                                                  |
  |                                                                       |
  | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
@@ -42,5 +42,5 @@
 
 // application constants
-define('RCMAIL_VERSION', '0.1-20070809');
+define('RCMAIL_VERSION', '0.1-20071017');
 define('RCMAIL_CHARSET', 'UTF-8');
 define('JS_OBJECT_NAME', 'rcmail');
@@ -173,5 +173,5 @@
   else
   {
-    $OUTPUT->show_message("loginfailed", 'warning');
+    $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'loginfailed', 'warning');
     rcmail_kill_session();
   }
@@ -202,5 +202,5 @@
   if (!$conn)
   {
-    $OUTPUT->show_message('imaperror', 'error');
+    $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'sessionerror', 'error');
     rcmail_kill_session();
   }
Index: /trunk/roundcubemail/program/include/rcube_imap.inc
===================================================================
--- /trunk/roundcubemail/program/include/rcube_imap.inc	(revision 881)
+++ /trunk/roundcubemail/program/include/rcube_imap.inc	(revision 882)
@@ -66,4 +66,5 @@
   var $search_charset = '';
   var $debug_level = 1;
+  var $error_code = 0;
 
 
@@ -132,4 +133,5 @@
     else if (!$this->conn && $GLOBALS['iil_error'])
       {
+      $this->error_code = $GLOBALS['iil_errornum'];
       raise_error(array('code' => 403,
                        'type' => 'imap',