Fixed SSL support; improved Courier compatibility; some visual enhancements and bugfixes

8 files changed, 440 insertions, 51 deletions

diff --git a/program/include/main.inc b/program/include/main.inc
index b4b2aa9e8..4a872a580 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -51,6 +51,10 @@ function rcmail_startup($task='mail')
     ini_set('display_errors', 1);
   else
     ini_set('display_errors', 0);
+  
+  // set session garbage collecting time according to session_lifetime
+  if (!empty($CONFIG['session_lifetime']))
+    ini_set('session.gc_maxlifetime', ($CONFIG['session_lifetime']+2)*60);
 
 
   // prepare DB connection
@@ -138,34 +142,43 @@ function rcmail_imap_init($connect=FALSE)
 
   $IMAP = new rcube_imap();
 
+  // connect with stored session data
+  if ($connect)
+    {
+    if (!($conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl'])))
+      show_message('imaperror', 'error');
+      
+    rcmail_set_imap_prop();
+    }
+
   // enable caching of imap data
   if ($CONFIG['enable_caching']===TRUE)
     $IMAP->set_caching(TRUE);
 
-  // set root dir from config
-  if (strlen($CONFIG['imap_root']))
-    $IMAP->set_rootdir($CONFIG['imap_root']);
-    
   if (is_array($CONFIG['default_imap_folders']))
     $IMAP->set_default_mailboxes($CONFIG['default_imap_folders']);
 
-  if (strlen($_SESSION['mbox']))
-    $IMAP->set_mailbox($_SESSION['mbox']);
-
-  if (isset($_SESSION['page']))
-    $IMAP->set_page($_SESSION['page']);
-
   // set pagesize from config
   if (isset($CONFIG['pagesize']))
     $IMAP->set_pagesize($CONFIG['pagesize']);
+  }
 
 
-  // connect with stored session data
-  if ($connect)
-    {
-    if (!($conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']))))
-      show_message('imaperror', 'error');
-    }
+// set root dir and last stored mailbox
+// this must be done AFTER connecting to the server
+function rcmail_set_imap_prop()
+  {
+  global $CONFIG, $IMAP;
+
+  // set root dir from config
+  if (strlen($CONFIG['imap_root']))
+    $IMAP->set_rootdir($CONFIG['imap_root']);
+
+  if (strlen($_SESSION['mbox']))
+    $IMAP->set_mailbox($_SESSION['mbox']);
+    
+  if (isset($_SESSION['page']))
+    $IMAP->set_page($_SESSION['page']);
   }
 
 
@@ -262,7 +275,7 @@ function rcmail_login($user, $pass, $host=NULL)
     {
     $host = $a_host['host'];
     $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
-    $imap_port = isset($a_host['post']) ? $a_host['post'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
+    $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
     }
 
   // exit if IMAP login failed
@@ -301,6 +314,8 @@ function rcmail_login($user, $pass, $host=NULL)
     {
     $_SESSION['user_id']   = $user_id;
     $_SESSION['imap_host'] = $host;
+    $_SESSION['imap_port'] = $imap_port;
+    $_SESSION['imap_ssl']  = $imap_ssl;
     $_SESSION['username']  = $user;
     $_SESSION['password']  = encrypt_passwd($pass);
 
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index a6e8d78a2..83ee32158 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -57,7 +57,7 @@ class rcube_imap
 
   function connect($host, $user, $pass, $port=143, $use_ssl=FALSE)
     {
-    global $ICL_PORT, $CONFIG;
+    global $ICL_SSL, $ICL_PORT, $CONFIG;
     
     // check for Open-SSL support in PHP build
     if ($use_ssl && in_array('openssl', get_loaded_extensions()))
@@ -66,6 +66,7 @@ class rcube_imap
       {
       raise_error(array('code' => 403,
                         'type' => 'imap',
+                        'file' => __FILE__,
                         'message' => 'Open SSL not available;'), TRUE, FALSE);
       $port = 143;
       }
@@ -98,7 +99,10 @@ class rcube_imap
       if (!empty($this->conn->delimiter))
         $this->delimiter = $this->conn->delimiter;
       if (!empty($this->conn->rootdir))
-        $this->root_ns = $this->conn->rootdir;
+        {
+        $this->set_rootdir($this->conn->rootdir);
+        $this->root_ns = ereg_replace('[\.\/]$', '', $this->conn->rootdir);
+        }
       }
 
     return $this->conn ? TRUE : FALSE;
@@ -185,6 +189,9 @@ class rcube_imap
     if ($this->conn && empty($this->delimiter))
       $this->delimiter = iil_C_GetHierarchyDelimiter($this->conn);
 
+    if (empty($this->delimiter))
+      $this->delimiter = '/';
+
     return $this->delimiter;
     }
 
@@ -268,8 +275,6 @@ class rcube_imap
     else
       $count = iil_C_CountMessages($this->conn, $mailbox);
 
-// print "/**** get messagecount for $mailbox ($mode): $count ****/\n";
-
     if (is_array($a_mailbox_cache[$mailbox]))
       $a_mailbox_cache[$mailbox] = array();
       
@@ -278,8 +283,6 @@ class rcube_imap
     // write back to cache
     $this->update_cache('messagecount', $a_mailbox_cache);
 
-//var_dump($a_mailbox_cache);
-
     return (int)$count;
     }
 
@@ -294,30 +297,163 @@ class rcube_imap
 
 
   // private method for listing message header
+  // by DrSlump <drslump@drslump.biz>
+  function __list_headers($mailbox='', $page=NULL, $sort_field='date', $sort_order='DESC')
+    {
+    $a_out = array();
+    $cached_count = 0;
+
+    if (!strlen($mailbox))
+      return $a_out;
+
+    $mbox_count = $this->_messagecount($mailbox /*, 'ALL', TRUE*/);
+
+    $revalidate = false;
+    if ($mbox_count)
+      {
+      // get cached headers
+      $a_out = $this->get_cache($mailbox.'.msg');
+      $a_out = is_array($a_out) ? $a_out : array(); // make sure we get an array
+
+      $cached_count = count($a_out);
+      $a_new = array();
+      $revalidate = true; // revalidate by default
+     
+      // if the cache count is greater then there have been changes for sure
+      if ($cached_count <= $mbox_count)
+        {
+        $from = $cached_count?$cached_count:1;
+       
+        //get new headers (at least one is returned)
+        $a_temp = iil_C_FetchHeaders($this->conn, $mailbox, $from . ':' . $mbox_count);
+        $duplicated = $cached_count?true:false;
+       
+        foreach ($a_temp as $hdr)
+          {
+          //skip the first one if duplicated
+          if ($duplicated)
+            {
+            //check for changes using the UID
+            $lastCacheHdr = end($a_out);
+            if ($hdr->uid === $lastCacheHdr->uid)
+              $revalidate = false;
+
+            $duplicated = false;
+            continue;
+            }
+           
+          //skip deleted ones
+          if (! $hdr->deleted)
+            $a_new[ $hdr->uid ] = $hdr;
+          }
+        }
+
+      //revalidate cache if needed
+      $to = $mbox_count - count($a_new);
+      if ($revalidate && $to !== 0)    //we'll need to reindex the array so we have to make a copy
+        {
+        $a_dirty = $a_out;
+        $a_out = array();
+        $a_buffers = array();
+
+        //fetch chunks of 20 headers
+        $step = 20;
+        $found = false;
+         
+        //fetch headers in blocks starting from new to old
+        do {
+          $from = $to-$step;
+          if ($from < 1) $from = 1;
+
+          //store the block in a temporal buffer
+          $a_buffers[$from] = iil_C_FetchHeaders($this->conn, $mailbox, $from . ':' . $to);
+
+          //compare the fetched headers with the ones in the cache
+          $idx = 0;
+          foreach ($a_buffers[$from] as $k=>$hdr)
+            {
+            //if it's different the comparison ends
+            if (!isset($a_dirty[$hdr->uid]) || $a_dirty[$hdr->uid]->id !== $hdr->id)
+              break;
+
+            //if we arrive here then we know that the older messages in cache are ok
+            $found = $hdr->id;
+            $idx++;
+            }
+
+          //remove from the buffer the headers which are already cached
+          if ($found)
+            $a_buffers[$from] = array_splice($a_buffers[$from], 0, $idx );
+             
+          $to = $from-1;
+          }
+        while ($found===false && $from > 1);
+
+        //just keep the headers we are certain that didn't change in the cache
+        if ($found !== false)
+          {
+          foreach ($a_dirty as $hdr)
+            {
+            if ($hdr->id > $found) break;
+            $a_out[$hdr->uid] = $hdr;
+            }
+          }
+           
+        //we builded the block buffers from new to older, we process them in reverse order
+        ksort($a_buffers, SORT_NUMERIC);
+        foreach ($a_buffers as $a_buff)
+          {
+          foreach ($a_buff as $hdr)
+            {
+            if (! $hdr->deleted)
+              $a_out[$hdr->uid] = $hdr;
+            }
+          }
+        }
+         
+      //array_merge() would reindex the keys, so we use this 'hack'
+      $a_out += $a_new;
+      }
+ 
+    //write headers list to cache if needed
+    if ($revalidate || count($a_out)!=$cached_count) {
+      $this->update_cache($mailbox.'.msg', $a_out);
+     }
+
+    //sort headers by a specific col
+    $a_out = iil_SortHeaders( $a_out, $sort_field, $sort_order );
+   
+    // return complete list of messages
+    if (strtolower($page)=='all')
+      return $a_out;
+
+    $start_msg = ($this->list_page-1) * $this->page_size;
+    return array_slice($a_out, $start_msg, $this->page_size);
+    }
+
+
+  // old function; replaced 2005/10/18
+  // private method for listing message header
   function _list_headers($mailbox='', $page=NULL, $sort_field='date', $sort_order='DESC')
     {
-    $max = $this->_messagecount($mailbox /*, 'ALL', TRUE*/);
-    
+    $max = $this->_messagecount($mailbox);
+
     if (!strlen($mailbox))
       return array();
 
     // get cached headers
     $a_msg_headers = $this->get_cache($mailbox.'.msg');
 
-// print "/**** count = $max; headers = ".sizeof($a_msg_headers)." ****/\n";
-
     // retrieve headers from IMAP
     if (!is_array($a_msg_headers) || sizeof($a_msg_headers) != $max)
       {
       $a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, "1:$max");
       $a_msg_headers = array();
-      
+
       if (!empty($a_header_index))
-		foreach ($a_header_index as $i => $headers)
-			if (!$headers->deleted)
-				$a_msg_headers[$headers->uid] = $headers;
-        
-// print "/**** fetch headers ****/\n";
+        foreach ($a_header_index as $i => $headers)
+          if (!$headers->deleted)
+            $a_msg_headers[$headers->uid] = $headers;
       }
     else
       $headers_cached = TRUE;
@@ -345,7 +481,7 @@ class rcube_imap
     $start_msg = ($this->list_page-1) * $this->page_size;
     return array_slice($a_headers, $start_msg, $this->page_size);
     }
-
+  
 
   // return sorted array of message UIDs
   function message_index($mbox='', $sort_field='date', $sort_order='DESC')
@@ -668,17 +804,17 @@ class rcube_imap
     $abs_name = $this->_mod_mailbox($name);
     $a_mailbox_cache = $this->get_cache('mailboxes');
     
-    if (strlen($this->root_ns))
-      $abs_name = $this->root_ns.$abs_name;
+    //if (strlen($this->root_ns))
+    //  $abs_name = $this->root_ns.$abs_name;
 
     if (strlen($abs_name) && (!is_array($a_mailbox_cache) || !in_array($abs_name, $a_mailbox_cache)))
       $result = iil_C_CreateFolder($this->conn, iil_utf7_encode($abs_name));
 
     // update mailboxlist cache
     if ($result && $subscribe)
-      $this->subscribe($this->root_ns.$name);
+      $this->subscribe($name);
 
-    return $result ? $this->root_ns.$name : FALSE;
+    return $result ? $name : FALSE;
     }
 
 
@@ -935,9 +1071,12 @@ class rcube_imap
 
   function _mod_mailbox($mbox, $mode='in')
     {
-    if (!empty($this->root_dir) && $mode=='in')
+    if (!empty($this->root_ns) && $this->root_ns == $mbox)
+      return $mbox;
+
+    if (!empty($this->root_dir) &&  $mode=='in') 
       $mbox = $this->root_dir.$this->delimiter.$mbox;
-    else if (strlen($this->root_dir) && $mode=='out')
+    else if (strlen($this->root_dir) && $mode=='out') 
       $mbox = substr($mbox, strlen($this->root_dir)+1);
 
     return $mbox;
diff --git a/program/js/app.js b/program/js/app.js
index 18ce6748d..418f33c1b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -204,7 +204,7 @@ function rcube_webmail()
 
     // flag object as complete
     this.loaded = true;
-      
+          
     // show message
     if (this.pending_message)
       this.display_message(this.pending_message[0], this.pending_message[1]);
diff --git a/program/localization/se/labels.inc b/program/localization/se/labels.inc
new file mode 100644
index 000000000..13930bb3f
--- /dev/null
+++ b/program/localization/se/labels.inc
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/en/labels.inc                                                |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Fredrik Nygren <f.nygren@gmail.com>                           |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$labels = array();
+
+// login page
+$labels['username']  = 'Användarnamn';
+$labels['password']  = 'Lösenord';
+$labels['server']    = 'Server';
+$labels['login']     = 'Logga in';
+
+// taskbar
+$labels['logout']   = 'Logga ut';
+$labels['mail']     = 'E-post';
+$labels['settings'] = 'Personliga inställningar';
+$labels['addressbook'] = 'Adressbok';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
+$labels['sent']   = 'Skickat';
+$labels['trash']  = 'Papperskorg';
+$labels['drafts'] = 'Utskick';
+$labels['junk']   = 'Skräppost';
+
+// message listing
+$labels['subject'] = 'Ämne';
+$labels['from']    = 'Avsändare';
+$labels['to']      = 'Mottagare';
+$labels['cc']      = 'Kopia';
+$labels['bcc']     = 'Bcc';
+$labels['replyto'] = 'Svar-till';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Storlek';
+$labels['priority'] = 'Prioritering';
+$labels['organization'] = 'Organisation';
+
+// aliases
+$labels['reply-to'] = $labels['replyto'];
+
+$labels['mailboxlist'] = 'Mappar';
+$labels['messagesfromto'] = 'Meddelande $from till $to av $count';
+$labels['messagenrof'] = 'Message $nr av $count';
+
+$labels['moveto']   = 'flytta till...';
+$labels['download'] = 'ladda ner';
+
+$labels['filename'] = 'Filnamn';
+$labels['filesize'] = 'Filstorlek';
+
+$labels['preferhtml'] = 'Föredra HTML';
+$labels['htmlmessage'] = 'HTML-meddelanden';
+$labels['prettydate'] = 'Fina datum';
+
+$labels['addtoaddressbook'] = 'Lägg till adressbok';
+
+// weekdays short
+$labels['sun'] = 'Sön';
+$labels['mon'] = 'Mån';
+$labels['tue'] = 'Tis';
+$labels['wed'] = 'Ons';
+$labels['thu'] = 'Tor';
+$labels['fri'] = 'Fre';
+$labels['sat'] = 'Lös';
+
+// weekdays long
+$labels['sunday']    = 'Söndag';
+$labels['monday']    = 'Måndag';
+$labels['tuesday']   = 'Tisdag';
+$labels['wednesday'] = 'Onsdag';
+$labels['thursday']  = 'Torsdag';
+$labels['friday']    = 'Fredag';
+$labels['saturday']  = 'Lödag';
+
+$labels['today'] = 'Idag';
+
+// toolbar buttons
+$labels['writenewmessage']  = 'Skapa nytt meddelande';
+$labels['replytomessage']   = 'Svar på meddelande';
+$labels['forwardmessage']   = 'Skicka vidare meddelande';
+$labels['deletemessage']    = 'Flytta till papperskorgen';
+$labels['printmessage']     = 'Skriv ut';
+$labels['previousmessages'] = 'Visa tidigare';
+$labels['nextmessages']     = 'Visa nästa';
+$labels['backtolist']       = 'Tillbaka till meddelandelistan';
+
+$labels['select'] = 'Välj';
+$labels['all'] = 'Alla';
+$labels['none'] = 'Ingen';
+$labels['unread'] = 'Oläst';
+
+// message compose
+$labels['compose']  = 'Skriv meddelande';
+$labels['sendmessage']  = 'Skicka meddelande nu';
+$labels['addattachment']  = 'Bifoga fil';
+
+$labels['attachments'] = 'Filer';
+$labels['upload'] = 'Ladda upp';
+$labels['close']  = 'Stäng';
+
+$labels['low']     = 'Låg';
+$labels['lowest']  = 'Lägst';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Hög';
+$labels['highest'] = 'Högst';
+
+$labels['showimages'] = 'Visa bilder';
+
+
+// address boook
+$labels['name']      = 'Visa namn';
+$labels['firstname'] = 'Förnamn';
+$labels['surname']   = 'Efternamn';
+$labels['email']     = 'E-post';
+
+$labels['addcontact'] = 'Lägg till ny kontakt';
+$labels['editcontact'] = 'Ändra kontakt';
+
+$labels['edit']   = 'Ändra';
+$labels['cancel'] = 'Avbryt';
+$labels['save']   = 'Spara';
+$labels['delete'] = 'Radera';
+
+$labels['newcontact']     = 'Skapa nytt kontaktkort';
+$labels['deletecontact']  = 'Radera valda kontakter';
+$labels['composeto']      = 'Skriv e-post till';
+$labels['contactsfromto'] = 'Kontakter $from till $to av $count';
+
+
+// settings
+$labels['settingsfor']  = 'Inställningar för';
+
+$labels['preferences']  = 'Inställningar';
+$labels['userpreferences']  = 'Användarinställningar';
+$labels['editpreferences']  = 'Ändra användarinställningar';
+
+$labels['identities']  = 'Identiteter';
+$labels['manageidentities']  = 'Hantera identiteter för kontot';
+$labels['newidentity']  = 'Ny identitet';
+
+$labels['newitem']  = 'Ny post';
+$labels['edititem']  = 'Ändra post';
+
+$labels['setdefault']  = 'Sätt som standard';
+$labels['language']  = 'Språk';
+$labels['timezone']  = 'Tidszon';
+$labels['pagesize']  = 'Rader per sida';
+
+
+$labels['folders']  = 'Mappar';
+$labels['foldername']  = 'Mappnamn';
+$labels['subscribed']  = 'Ansluten';
+$labels['create']  = 'Skapa';
+$labels['createfolder']  = 'Skapa ny mapp';
+$labels['deletefolder']  = 'Radera mapp';
+$labels['managefolders']  = 'Hantera mappar';
+
+
+?>
\ No newline at end of file
diff --git a/program/localization/se/messages.inc b/program/localization/se/messages.inc
new file mode 100644
index 000000000..7ec1e9861
--- /dev/null
+++ b/program/localization/se/messages.inc
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/en/messages.inc                                              |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Fredrik Nygren <f.nygren@gmail.com>                           |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$messages = array();
+
+$messages['loginfailed']  = 'Inloggningen misslyckades';
+
+$messages['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
+
+$messages['sessionerror'] = 'Din session är felaktig eller har gått ut';
+
+$messages['imaperror'] = 'Kommunikationen med IMAP-servern misslyckades';
+
+$messages['nomessagesfound'] = 'Inga meddelanden i den här mappen';
+
+$messages['loggedout'] = 'Du har avslutat sessionen. Hej då!';
+
+$messages['mailboxempty'] = 'Mappen är tom';
+
+$messages['loadingdata'] = 'Laddar data...';
+
+$messages['messagesent'] = 'Meddelande skickades';
+
+$messages['successfullysaved'] = 'Sparat';
+
+$messages['addedsuccessfully'] = 'Kontakt har lagts till i adressboken';
+
+$messages['contactexists'] = 'En kontakt med den angivna e-postadressen existerar redan';
+
+$messages['blockedimages'] = 'För att skydda dig har externa bilder blockerats från meddelandet';
+
+$messages['encryptedmessage'] = 'Det här är ett krypterat meddelande som inte kan visas. Tyvärr!';
+
+$messages['nocontactsfound'] = 'Inga kontakter hittades';
+
+$messages['sendingfailed'] = 'Misslyckades med att skicka meddelandet';
+
+$messages['errorsaving'] = 'Problem med sparandet uppstod';
+
+
+?>
\ No newline at end of file
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 52b64d804..f7e094aa0 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -509,7 +509,7 @@ function rcmail_priority_selector($attrib)
                        rcube_label('normal'),
                        rcube_label('high'),
                        rcube_label('highest')),
-                 array(1, 2, 0, 4, 5));
+                 array(5, 4, 0, 2, 1));
                  
   $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0;
 
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index c0b303a62..98e0cdbbf 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -198,12 +198,16 @@ function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxl
   $out = '';
   foreach ($arrFolders as $key=>$folder)
     {
-    // shorten the folder name to a given length
-    if ($maxlength && $maxlength>1)
-      $foldername = abbrevate_string($folder['name'], $maxlength);
+    $folder_lc = strtolower($folder['id']);
+    if (in_array($folder_lc, $special))
+      $foldername = rcube_label($folder_lc);
     else
       $foldername = $folder['name'];
 
+    // shorten the folder name to a given length
+    if ($maxlength && $maxlength>1)
+      $foldername = abbrevate_string($foldername, $maxlength);
+
     $out .= sprintf('<option value="%s">%s%s</option>'."\n",
                     $folder['id'],
                     str_repeat('&nbsp;', $nestLevel*4),
@@ -303,13 +307,13 @@ function rcmail_message_list($attrib)
       if ($col=='from' || $col=='to')
         $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3, $attrib['addicon']));
       else if ($col=='subject')
-        $cont = rep_specialchars_output($IMAP->decode_header($header->$col));
+        $cont = rep_specialchars_output($IMAP->decode_header($header->$col), 'html', 'all');
       else if ($col=='size')
         $cont = show_bytes($header->$col);
       else if ($col=='date')
         $cont = format_date($header->date); //date('m.d.Y G:i:s', strtotime($header->date));
       else
-        $cont = rep_specialchars_output($header->$col);
+        $cont = rep_specialchars_output($header->$col, 'html', 'all');
         
 	  $out .= '<td class="'.$col.'">' . $cont . "</td>\n";
       }
@@ -377,13 +381,13 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE)
       if ($col=='from' || $col=='to')
         $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3));
       else if ($col=='subject')
-        $cont = rep_specialchars_output($IMAP->decode_header($header->$col));
+        $cont = rep_specialchars_output($IMAP->decode_header($header->$col), 'html', 'all');
       else if ($col=='size')
         $cont = show_bytes($header->$col);
       else if ($col=='date')
         $cont = format_date($header->date); //date('m.d.Y G:i:s', strtotime($header->date));
       else
-        $cont = rep_specialchars_output($header->$col);
+        $cont = rep_specialchars_output($header->$col, 'html', 'all');
           
       $a_msg_cols[$col] = $cont;
       }
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 20d46e37d..41b11d5d1 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -65,11 +65,13 @@ $pages = ceil($IMAP->messagecount()/$IMAP->page_size);
 $commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
 $commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
 
-  
+
 // update mailboxlist
 $mbox = $IMAP->get_mailbox_name();
 $commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", $_GET['_target_mbox'], $IMAP->messagecount($_GET['_target_mbox'], 'UNSEEN'));
+
+if ($_action=='moveto')
+  $commands .= sprintf("this.set_unread_count('%s', %d);\n", $_GET['_target_mbox'], $IMAP->messagecount($_GET['_target_mbox'], 'UNSEEN'));
 
 
 // add new rows from next page (if any)