Apply changes from r2348 to r2400 for 0.2.2 release

59 files changed, 1101 insertions, 605 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 78bf9d423..ddf202717 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,31 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix quicksearchbox look in Chrome and Konqueror (#1484841)
+- Fix UTF-8 byte-order mark removing (#1485514)
+- Fix folders subscribtions on Konqueror (#1484841) 
+- Fix debug console on Konqueror and Safari
+- Fix messagelist focus issue when modifying status of selected messages (#1485807)
+- Support STARTTLS in IMAP connection (#1485284)
+- Fix DEL key problem in search boxes (#1485528)
+- Support several e-mail addresses per user from virtuser_file (#1485678)
+- Fix drag&drop with scrolling on IE (#1485786)
+- Fix adding signature separator in html mode (#1485350)
+- Fix opening attachment marks message as read (#1485803)
+- Fix 'temp_dir' does not support relative path under Windows (#1484529)
+- Fix "Initialize Database" button missing from installer (#1485802)
+- Fix compose window doesn't fit 1024x768 window (#1485396)
+- Fix service not available error when pressing back from compose dialog (#1485552)
+- Fix using mail() on Windows (#1485779)
+- Fix word wrapping in message-part's <PRE>s for printing (#1485787)
+- Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714)
+- Fix double footer in HTML message with embedded images
+- Fix TNEF implementation bug (#1485773)
+- Fix incorrect row id parsing for LDAP contacts list (#1485784) 
+- Fix 'mode' parameter in sqlite DSN (#1485772)
+
+RELEASE 0.2.1
+------------------
 - Use US-ASCII as failover when Unicode searching fails (#1485762)
 - Fix errors handling in IMAP command continuations (#1485762)
 - Fix FETCH result parsing for servers returning flags at the end of result (#1485763)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 1870852b7..42af34d62 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -51,7 +51,7 @@ $rcmail_config['auto_create_user'] = TRUE;
 // the mail host chosen to perform the log-in
 // leave blank to show a textbox at login, give a list of hosts
 // to display a pulldown menu or set one host as string.
-// To use SSL connection, enter ssl://hostname:993
+// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
 $rcmail_config['default_host'] = '';
 
 // TCP port used for IMAP connections
@@ -152,7 +152,7 @@ $rcmail_config['date_long'] = 'd.m.Y H:i';
 $rcmail_config['date_today'] = 'H:i';
 
 // add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'RoundCube Webmail/0.2.1';
+$rcmail_config['useragent'] = 'RoundCube Webmail/0.2.2';
 
 // use this name to compose page titles
 $rcmail_config['product_name'] = 'RoundCube Webmail';
diff --git a/installer/test.php b/installer/test.php
index d66fe34f2..5740a6489 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -159,7 +159,7 @@ if ($db_working && $_POST['initdb']) {
 // test database
 if ($db_working) {
     $db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}");
-    if (!$db_read) {
+    if ($DB->db_error) {
         $RCI->fail('DB Schema', "Database not initialized");
         echo '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
         $db_working = false;
diff --git a/program/include/main.inc b/program/include/main.inc
index 9adcd4cfc..b22be1aca 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -192,7 +192,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
   if ($to == 'UNICODE-1-1-UTF-7')
     $to = 'UTF-7';
 
-  if ($from==$to || $str=='' || empty($from))
+  if ($from == $to || empty($str) || empty($from))
     return $str;
     
   $aliases = array(
@@ -246,6 +246,8 @@ function rcube_charset_convert($str, $from, $to=NULL)
   if ($from == 'UTF-7') {
     if ($_str = utf7_to_utf8($str))
       $str = $_str;
+    else
+      $error = true;
   }
   else if (($from == 'ISO-8859-1') && function_exists('utf8_encode')) {
     $str = utf8_encode($str);
@@ -254,7 +256,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
     $conv->loadCharset($from);
     $str = $conv->strToUtf8($str);
   }
-  else if ($from != 'UTF-8') {}
+  else if ($from != 'UTF-8')
     $error = true;
 
   // encode string for output
@@ -278,7 +280,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
       'code' => 500,
       'type' => 'php',
       'file' => __FILE__,
-      'message' => "Could not convert string charset. Make sure iconv is installed or lib/utf8.class is available"
+      'message' => "Could not convert string from $from to $to. Make sure iconv is installed or lib/utf8.class is available"
       ), true, false);
     
     $convert_warning = true;
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index f109c16fd..9aad25b27 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -436,11 +436,13 @@ class rcmail
     if ($a_host['host']) {
       $host = $a_host['host'];
       $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;
-      $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $config['default_port']);
+      if(!empty($a_host['port']))
+        $imap_port = $a_host['port'];
+      else if ($imap_ssl && $imap_ssl != 'tls')
+        $imap_port = 993;
     }
-    else
-      $imap_port = $config['default_port'];
-
+    
+    $imap_port = $imap_port ? $imap_port : $config['default_port'];
 
     /* Modify username with domain if required  
        Inspired by Marco <P0L0_notspam_binware.org>
@@ -453,9 +455,10 @@ class rcmail
         $username .= '@'.$config['username_domain'];
     }
 
-    // try to resolve email address from virtuser table    
-    if (!empty($config['virtuser_file']) && strpos($username, '@'))
-      $username = rcube_user::email2user($username);
+    // try to resolve email address from virtuser table
+    if (strpos($username, '@'))
+      if ($virtuser = rcube_user::email2user($username))
+        $username = $virtuser;
 
     // lowercase username if it's an e-mail address (#1484473)
     if (strpos($username, '@'))
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 637e25b92..da7c5bf88 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -97,7 +97,7 @@ class rcube_imap
     global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;
     
     // check for Open-SSL support in PHP build
-    if ($use_ssl && in_array('openssl', get_loaded_extensions()))
+    if ($use_ssl && extension_loaded('openssl'))
       $ICL_SSL = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
     else if ($use_ssl)
       {
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index f1cbb19c3..a05815800 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -405,6 +405,54 @@ function rc_strrpos($haystack, $needle, $offset=0)
     return strrpos($haystack, $needle, $offset);
 }
 
+/**
+ * Wrapper function for wordwrap
+ */
+function rc_wordwrap($string, $width=75, $break="\n", $cut=false)
+{
+  if (!function_exists('mb_substr') || !function_exists('mb_strlen'))
+    return wordwrap($string, $width, $break, $cut);
+    
+  $para = explode($break, $string);
+  $string = '';
+  while (count($para)) {
+    $list = explode(' ', array_shift($para));
+    $len = 0;
+    while (count($list)) {
+      $line = array_shift($list);
+      $l = mb_strlen($line);
+      $newlen = $len + $l + ($len ? 1 : 0);
+
+      if ($newlen <= $width) {
+        $string .= ($len ? ' ' : '').$line;
+        $len += ($len ? 1 : 0) + $l;
+      } else {
+	if ($l > $width) {
+	  if ($cut) {
+	    $start = 0;
+	    while ($l) {
+	      $str = mb_substr($line, $start, $width);
+	      $strlen = mb_strlen($str);
+	      $string .= ($len ? $break : '').$str;
+	      $start += $strlen;
+	      $l -= $strlen;
+	      $len = $strlen;
+	    }
+	  } else {
+            $string .= ($len ? $break : '').$line;
+	    if (count($list)) $string .= $break;
+	    $len = 0;
+	  }
+	} else {
+          $string .= $break.$line;
+	  $len = $l;
+        }
+      }
+    }
+    if (count($para)) $string .= $break;
+  }
+  return $string;
+}
 
 /**
  * Read a specific HTTP request header
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index b8833b3c7..17debeb7a 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -350,10 +350,12 @@ class rcube_user
     $rcmail = rcmail::get_instance();
     $dbh = $rcmail->get_dbh();
 
-    // try to resolve user in virtusertable
-    if ($rcmail->config->get('virtuser_file') && !strpos($user, '@'))
-      $user_email = rcube_user::user2email($user);
-
+    // try to resolve user in virtuser table and file
+    if (!strpos($user, '@')) {
+      if ($email_list = self::user2email($user, false))
+        $user_email = $email_list[0];
+    }
+    
     $dbh->query(
       "INSERT INTO ".get_table_name('users')."
         (created, last_login, username, mail_host, alias, language)
@@ -372,35 +374,21 @@ class rcube_user
 
       $user_name = $user != $user_email ? $user : '';
 
-      // try to resolve the e-mail address from the virtuser table
-      if (($virtuser_query = $rcmail->config->get('virtuser_query'))
-    	&& ($sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($user), $virtuser_query)))
-	&& ($dbh->num_rows() > 0))
-      {
-        $standard = 1;
-        while ($sql_arr = $dbh->fetch_array($sql_result))
-        {
-          $dbh->query(
+      if (empty($email_list))
+        $email_list[] = strip_newlines($user_email); 
+
+      // also create new identity records
+      $standard = 1;
+      foreach ($email_list as $email) {
+        $dbh->query(
             "INSERT INTO ".get_table_name('identities')."
               (user_id, del, standard, name, email)
              VALUES (?, 0, ?, ?, ?)",
             $user_id,
 	    $standard,
             strip_newlines($user_name),
-            preg_replace('/^@/', $user . '@', $sql_arr[0]));
-	  $standard = 0;
-        }
-      }
-      else
-      {
-        // also create new identity records
-        $dbh->query(
-          "INSERT INTO ".get_table_name('identities')."
-            (user_id, del, standard, name, email)
-           VALUES (?, 0, 1, ?, ?)",
-          $user_id,
-          strip_newlines($user_name),
-          strip_newlines($user_email));
+            preg_replace('/^@/', $user . '@', $email));
+	$standard = 0;
       }
     }
     else
@@ -418,14 +406,13 @@ class rcube_user
   
   
   /**
-   * Resolve username using a virtuser table
+   * Resolve username using a virtuser file
    *
    * @param string E-mail address to resolve
    * @return string Resolved IMAP username
    */
   static function email2user($email)
   {
-    $user = $email;
     $r = self::findinvirtual('^' . quotemeta($email) . '[[:space:]]');
 
     for ($i=0; $i<count($r); $i++)
@@ -433,44 +420,57 @@ class rcube_user
       $data = trim($r[$i]);
       $arr = preg_split('/\s+/', $data);
       if (count($arr) > 0)
-      {
-        $user = trim($arr[count($arr)-1]);
-        break;
-      }
+        return trim($arr[count($arr)-1]);
     }
 
-    return $user;
+    return NULL;
   }
 
 
   /**
-   * Resolve e-mail address from virtuser table
+   * Resolve e-mail address from virtuser file/table
    *
    * @param string User name
-   * @return string Resolved e-mail address
+   * @param boolean If true returns first found entry
+   * @return mixed Resolved e-mail address string or array of strings
    */
-  static function user2email($user)
+  static function user2email($user, $first=true)
   {
-    $email = '';
-    $r = self::findinvirtual('[[:space:]]' . quotemeta($user) . '[[:space:]]*$');
+    $result = array();
+    $rcmail = rcmail::get_instance();
+    $dbh = $rcmail->get_dbh();
 
+    // SQL lookup
+    if ($virtuser_query = $rcmail->config->get('virtuser_query')) {
+      $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($user), $virtuser_query));
+      while ($sql_arr = $dbh->fetch_array($sql_result))
+        if (strpos($sql_arr[0], '@')) {
+          $result[] = $sql_arr[0];
+	  if ($first)
+	    return $result[0];
+	}
+    }
+    // File lookup
+    $r = self::findinvirtual('[[:space:]]' . quotemeta($user) . '[[:space:]]*$');
     for ($i=0; $i<count($r); $i++)
     {
       $data = $r[$i];
       $arr = preg_split('/\s+/', $data);
-      if (count($arr) > 0)
+      if (count($arr) > 0 && strpos($arr[0], '@'))
       {
-        $email = trim(str_replace('\\@', '@', $arr[0]));
-        break;
+        $result[] = trim(str_replace('\\@', '@', $arr[0]));
+
+	if ($first)
+          return $result[0];
       }
     }
-
-    return $email;
+    
+    return empty($result) ? NULL : $result;
   }
   
   
   /**
-   * Find matches of the given pattern in virtuser table
+   * Find matches of the given pattern in virtuser file
    * 
    * @param string Regular expression to search for
    * @return array Matching entries
@@ -500,7 +500,6 @@ class rcube_user
     return $result;
   }
 
-
 }
 
 
diff --git a/program/js/app.js b/program/js/app.js
index 7f1e7241b..205bb2d6d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -53,7 +53,6 @@ function rcube_webmail()
   this.env.bin_path = './bin/';
   this.env.blankpage = 'program/blank.gif';
 
-
   // set environment variable(s)
   this.set_env = function(p, value)
     {
@@ -1159,19 +1158,21 @@ function rcube_webmail()
   this.doc_mouse_up = function(e)
   {
     var model, li;
-    
+
     if (this.message_list) {
-      this.message_list.blur();
+      if (!rcube_mouse_is_over(e, this.message_list.list))
+        this.message_list.blur();
       model = this.env.mailboxes;
     }
     else if (this.contact_list) {
-      this.contact_list.blur();
+      if (!rcube_mouse_is_over(e, this.contact_list.list))
+        this.contact_list.blur();
       model = this.env.address_sources;
     }
     else if (this.ksearch_value) {
       this.ksearch_blur();
     }
-    
+
     // handle mouse release when dragging
     if (this.drag_active && model && this.env.last_folder_target) {
       this.set_classname(this.get_folder_li(this.env.last_folder_target), 'droptarget', false);
@@ -1182,6 +1183,9 @@ function rcube_webmail()
 
   this.drag_start = function(list)
   {
+    this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
+    this.initialMailBoxScrollTop = document.getElementById("mailboxlist-container").scrollTop;
+
     var model = this.task == 'mail' ? this.env.mailboxes : this.env.address_sources;
 
     this.drag_active = true;
@@ -1213,10 +1217,17 @@ function rcube_webmail()
     {
     if (this.gui_objects.folderlist && this.env.folder_coords)
       {
+      // offsets to compensate for scrolling while dragging a message
+      var boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop;
+      var moffset = this.initialMailBoxScrollTop-document.getElementById('mailboxlist-container').scrollTop;
+      var toffset = -moffset-boffset;
+
       var li, pos, mouse;
       mouse = rcube_event.get_mouse_pos(e);
       pos = this.env.folderlist_coords;
 
+      mouse.y += toffset;
+
       // if mouse pointer is outside of folderlist
       if (mouse.x < pos.x1 || mouse.x >= pos.x2 
 	    || mouse.y < pos.y1 || mouse.y >= pos.y2)
@@ -1290,10 +1301,13 @@ function rcube_webmail()
 
   this.click_on_list = function(e)
     {
+    if (this.gui_objects.qsearchbox)
+      this.gui_objects.qsearchbox.blur();
+
     if (this.message_list)
       this.message_list.focus();
     else if (this.contact_list)
-        this.contact_list.focus();
+      this.contact_list.focus();
 
     var mbox_li;
     if (mbox_li = this.get_folder_li())
@@ -1405,6 +1419,7 @@ function rcube_webmail()
       {
       this.set_busy(true, 'loading');
       target.location.href = this.env.comm_path+url;
+
       // mark as read and change mbox unread counter
       if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
         {
@@ -1428,10 +1443,10 @@ function rcube_webmail()
         if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
           window.frames[this.env.contentframe].location.href = this.env.blankpage;
         }
-      else if (!bw.safari)
+      else if (!bw.safari && !bw.konq)
         frm.style.display = show ? 'block' : 'none';
       }
-      
+
     if (!show && this.busy)
       this.set_busy(false);
     };
@@ -2210,6 +2225,13 @@ function rcube_webmail()
 	  {
 	  newsig = this.env.signatures[id]['text'];
 	  htmlsig = this.env.signatures[id]['is_html'];
+        
+	  if (newsig) {
+	    if (htmlsig && this.env.signatures[id]['plain_text'].indexOf('-- ')!=0)
+              newsig = '<p>-- </p>' + newsig;
+	    else if (!htmlsig && newsig.indexOf('-- ')!=0)
+              newsig = '-- \n' + newsig;
+	    }
 	  }
 
         if (htmlsig)
@@ -2441,7 +2463,11 @@ function rcube_webmail()
       case 27:  // escape
         this.ksearch_hide();
         break;
-
+      
+      case 37:  // left
+      case 39:  // right
+        if (mod != SHIFT_KEY)
+	  return;
       }
 
     // start timer
@@ -2508,7 +2534,7 @@ function rcube_webmail()
 
     // Don't (re-)search if string is empty or if the last results are still active
     if (!q.length || q == this.ksearch_value)
-        return;
+      return;
 
     this.ksearch_value = q;
     
@@ -2524,22 +2550,13 @@ function rcube_webmail()
       
     this.hide_message();
     this.env.contacts = results ? results : [];
-
-    var result_ids = new Array();
-    var c=0;
-    for (var i=0; i < this.env.contacts.length; i++) {
-      result_ids[c++] = i;
-      if (c == 15)  // limit search results
-        break;
-    }
-    
-    this.ksearch_display_results(this.env.contacts, result_ids, c);
+    this.ksearch_display_results(this.env.contacts);
   };
 
-  this.ksearch_display_results = function (a_results, a_result_ids, c)
+  this.ksearch_display_results = function (a_results)
   {
     // display search results
-    if (c && a_results.length && this.ksearch_input) {
+    if (a_results.length && this.ksearch_input) {
       var p, ul, li;
       
       // create results pane if not present
@@ -2561,27 +2578,14 @@ function rcube_webmail()
         li.innerHTML = a_results[i].replace(new RegExp('('+this.ksearch_value+')', 'ig'), '##$1%%').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/##([^%]+)%%/g, '<b>$1</b>');
         li.onmouseover = function(){ ref.ksearch_select(this); };
         li.onmouseup = function(){ ref.ksearch_click(this) };
-        li._rcm_id = a_result_ids[i];
+        li._rcm_id = i;
         ul.appendChild(li);
       }
 
-      // check if last selected item is still in result list
-      if (this.ksearch_selected !== null) {
-        p = find_in_array(this.ksearch_selected, a_result_ids);
-        if (p >= 0 && ul.childNodes) {
-          ul.childNodes[p].setAttribute('id', 'rcmksearchSelected');
-          this.set_classname(ul.childNodes[p], 'selected', true);
-        }
-        else
-          this.ksearch_selected = null;
-      }
-      
-      // if no item selected, select the first one
-      if (this.ksearch_selected === null) {
-        ul.firstChild.setAttribute('id', 'rcmksearchSelected');
-        this.set_classname(ul.firstChild, 'selected', true);
-        this.ksearch_selected = a_result_ids[0];
-      }
+      // select the first
+      ul.firstChild.setAttribute('id', 'rcmksearchSelected');
+      this.set_classname(ul.firstChild, 'selected', true);
+      this.ksearch_selected = 0;
 
       // move the results pane right under the input box and make it visible
       var pos = rcube_get_object_pos(this.ksearch_input);
diff --git a/program/js/common.js b/program/js/common.js
index 5923989ec..c8670a277 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -602,41 +602,47 @@ function getCookie(name)
 
 roundcube_browser.prototype.get_cookie = getCookie;
 
-
 // tiny replacement for Firebox functionality
 function rcube_console()
 {
   this.log = function(msg)
   {
-    box = rcube_find_object('console');
+    var box = rcube_find_object('console');
 
-    if (box)
+    if (box) {
       if (msg.charAt(msg.length-1)=='\n')
-        box.value += msg+'--------------------------------------\n';
+	msg += '--------------------------------------\n';
       else
-        box.value += msg+'\n--------------------------------------\n';
+        msg += '\n--------------------------------------\n';
+
+      // Konqueror doesn't allows to just change value of hidden element
+      if (bw.konq) {
+        box.innerText += msg;
+        box.value = box.innerText;
+      } else
+        box.value += msg;
+    }
   };
 
   this.reset = function()
   {
-    box = rcube_find_object('console');
+    var box = rcube_find_object('console');
     if (box)
-      box.value = '';
+      box.innerText = box.value = '';
   };
 }
 
 var bw = new roundcube_browser();
-
 if (!window.console)
-  console = new rcube_console();
+  var console = new rcube_console();
 
 
 // Add escape() method to RegExp object
 // http://dev.rubyonrails.org/changeset/7271
 RegExp.escape = function(str)
-  {
+{
   return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
-  }
+}
 
 
 // Make getElementById() case-sensitive on IE
diff --git a/program/js/list.js b/program/js/list.js
index 8d8f9e965..522af59ab 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -104,7 +104,7 @@ init: function()
 init_row: function(row)
 {
   // make references in internal array and set event handlers
-  if (row && String(row.id).match(/rcmrow([a-z0-9\-_=]+)/i))
+  if (row && String(row.id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i))
   {
     var p = this;
     var uid = RegExp.$1;
@@ -220,7 +220,7 @@ drag_row: function(e, id)
   // don't do anything (another action processed before)
   var evtarget = rcube_event.get_target(e);
   if (this.dont_select || (evtarget && (evtarget.tagName == 'INPUT' || evtarget.tagName == 'IMG')))
-    return false;
+    return true;
     
   // accept right-clicks
   if (rcube_event.get_button(e) == 2)
@@ -285,10 +285,10 @@ click_row: function(e, id)
   var now = new Date().getTime();
   var mod_key = rcube_event.get_modifier(e);
   var evtarget = rcube_event.get_target(e);
-  
+
   if ((evtarget && (evtarget.tagName == 'INPUT' || evtarget.tagName == 'IMG')))
-    return false;
-  
+    return true;
+
   // don't do anything (another action processed before)
   if (this.dont_select)
     {
@@ -355,7 +355,7 @@ get_last_row: function()
     var rows = this.list.tBodies[0].rows;
 
     for(var i=rows.length-1; i>=0; i--)
-      if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=]+)/i) && this.rows[RegExp.$1] != null)
+      if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
 	return RegExp.$1;
     }
 
@@ -755,7 +755,10 @@ drag_mouse_move: function(e)
               (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c)))
             {
               subject = node.nodeType==3 ? node.data : node.innerHTML;
-              names += (subject.length > 50 ? subject.substring(0, 50)+'...' : subject) + '<br />';
+	      // remove leading spaces
+	      subject = subject.replace(/^\s+/i, '');
+              // truncate line to 50 characters
+	      names += (subject.length > 50 ? subject.substring(0, 50)+'...' : subject) + '<br />';
               break;
             }
             c++;
@@ -774,7 +777,7 @@ drag_mouse_move: function(e)
   if (this.drag_active && this.draglayer)
   {
     var pos = rcube_event.get_mouse_pos(e);
-    this.draglayer.move(pos.x+20, pos.y-5);
+    this.draglayer.move(pos.x+20, bw.ie ? pos.y-5+document.documentElement.scrollTop : pos.y-5);
     this.trigger_event('dragmove', e);
   }
 
@@ -824,8 +827,6 @@ drag_mouse_up: function(e)
       }
     }
 
-  this.focus();
-  
   return rcube_event.cancel(e);
 },
 
diff --git a/program/lib/html2text.php b/program/lib/html2text.php
index e78ea10a9..dbf0943d5 100644
--- a/program/lib/html2text.php
+++ b/program/lib/html2text.php
@@ -522,9 +522,9 @@ class html2text
             $this->_link_count++;
             $this->_link_list .= "[" . $this->_link_count . "] $link\n";
             $additional = ' [' . $this->_link_count . ']';
-		} elseif ( substr($link, 0, 11) == 'javascript:' ) {
-			// Don't count the link; ignore it
-			$additional = '';
+	} elseif ( substr($link, 0, 11) == 'javascript:' ) {
+		// Don't count the link; ignore it
+		$additional = '';
 		// what about href="#anchor" ?
         } else {
             $this->_link_count++;
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 67a2b7b3c..995d82fb6 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -335,6 +335,7 @@ function iil_StartsWithI($string, $match, $bye=false) {
 	}
 	if ($bye && strncmp($string, '* BYE ', 6) == 0) {
 		return true;
+
 	}
 	return false;
 }
@@ -383,6 +384,12 @@ function iil_C_GetCapability(&$conn, $name)
 	return false;
 }
 
+function iil_C_ClearCapability(&$conn)
+{
+	$conn->capability = array();
+	$conn->capability_readed = false;
+}
+
 function iil_C_Authenticate(&$conn, $user, $pass, $encChallenge) {
     
     $ipad = '';
@@ -564,7 +571,7 @@ function iil_Connect($host, $user, $password, $options=null) {
 		
 	$result = false;
 	
-	//initialize connection
+	// initialize connection
 	$conn              = new iilConnection;
 	$conn->error       = '';
 	$conn->errorNum    = 0;
@@ -598,16 +605,15 @@ function iil_Connect($host, $user, $password, $options=null) {
 		$iil_errornum = -1;
 		return false;
 	}
+
 	if (!$ICL_PORT) {
 		$ICL_PORT = 143;
 	}
-    
 	//check for SSL
-	if ($ICL_SSL) {
+	if ($ICL_SSL && $ICL_SSL != 'tls') {
 		$host = $ICL_SSL . '://' . $host;
 	}
-	
-	//open socket connection
+
 	$conn->fp = fsockopen($host, $ICL_PORT, $errno, $errstr, 10);
 	if (!$conn->fp) {
     		$iil_error = "Could not connect to $host at port $ICL_PORT: $errstr";
@@ -625,6 +631,29 @@ function iil_Connect($host, $user, $password, $options=null) {
 
 	$conn->message .= $line;
 
+	// TLS connection
+	if ($ICL_SSL == 'tls' && iil_C_GetCapability($conn, 'STARTTLS')) {
+        	if (version_compare(PHP_VERSION, '5.1.0', '>=')) {
+               		iil_PutLine($conn->fp, 'stls000 STARTTLS');
+
+			$line = iil_ReadLine($conn->fp, 4096);
+                	if (!iil_StartsWith($line, 'stls000 OK')) {
+				$iil_error = "Server responded to STARTTLS with: $line";
+				$iil_errornum = -2;
+                    		return false;
+                	}
+
+			if (!stream_socket_enable_crypto($conn->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+				$iil_error = "Unable to negotiate TLS";
+				$iil_errornum = -2;
+				return false;
+			}
+			
+			// Now we're authenticated, capabilities need to be reread
+			iil_C_ClearCapability($conn);
+        	}
+	}
+
 	if (strcasecmp($auth_method, "check") == 0) {
 		//check for supported auth methods
 		if (iil_C_GetCapability($conn, 'AUTH=CRAM-MD5') || iil_C_GetCapability($conn, 'AUTH=CRAM_MD5')) {
@@ -2433,7 +2462,7 @@ function iil_C_FetchMIMEHeaders(&$conn, $mailbox, $id, $parts) {
 
 	// format request
 	foreach($parts as $part)
-		$peeks[] = "BODY[$part.MIME]";
+		$peeks[] = "BODY.PEEK[$part.MIME]";
 	
 	$request = "$key FETCH $id (" . implode(' ', $peeks) . ')';
 
diff --git a/program/lib/tnef_decoder.inc b/program/lib/tnef_decoder.inc
index f9b7c3684..8e3682a9b 100644
--- a/program/lib/tnef_decoder.inc
+++ b/program/lib/tnef_decoder.inc
@@ -102,7 +102,7 @@ function tnef_geti32(&$buf)
 
 function tnef_decode_attribute($attribute, &$buf)
 {
-   global $debug, $download;
+   global $debug;
 
    $length = tnef_geti32($buf);
    $value = tnef_getx($length, $buf); //data
@@ -116,9 +116,9 @@ function tnef_decode_attribute($attribute, &$buf)
    switch($attribute)
    {
       case TNEF_BODYTEXT:
-         if (!$download)
+         if ($debug)
          {
-            printf("<b>Embedded message:</b><pre>%s</pre>",$value);
+            printf("<b>Embedded message:</b><pre>%s</pre>", $value);
          }
          break;
 
@@ -195,7 +195,7 @@ function extract_mapi_attrs($buf, &$attachment_data)
 
          case TNEF_MAPI_ATTACH_DATA:
             tnef_getx(16, $value); // skip the next 16 bytes (unknown data)
-            array_shift($attachment_data); // eliminate the current (bogus) attachment
+	    array_shift($attachment_data); // eliminate the current (bogus) attachment
             do_tnef_decode($value, $attachment_data); // recursively process the attached message
             break;
 
@@ -349,4 +349,4 @@ function tnef_decode($buf)
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 5018ae6f8..445ecf035 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -1,9 +1,8 @@
 <?php
 
 /*
-
 +-----------------------------------------------------------------------+
-| language/da/labels.inc                                                |
+| language/da_DK/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
 | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
@@ -122,6 +121,9 @@ $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
 $labels['unread'] = 'Ulæste';
+$labels['flagged'] = 'Markeret';
+$labels['unanswered'] = 'Ubesvaret';
+$labels['filter'] = 'Filter';
 $labels['compact'] = 'Ryd op';
 $labels['empty'] = 'Tøm';
 $labels['purge'] = 'Udrens';
@@ -217,14 +219,20 @@ $labels['logoutclear'] = 'Tøm Skrald når jeg logger af';
 $labels['logoutcompact'] = 'Komprimér Indbakke når jeg logger af';
 $labels['uisettings'] = 'Brugerinterface';
 $labels['serversettings'] = 'Serverindstillinger';
+$labels['mdnrequests'] = 'Kvitteringer';
 $labels['askuser'] = 'spørg brugeren';
 $labels['autosend'] = 'send automatisk';
 $labels['ignore'] = 'ignorér';
 $labels['readwhendeleted'] = 'Markér beskeden som læst ved sletning';
+$labels['flagfordeletion'] = 'Markér beskeden til sletning istedet for at slette';
 $labels['skipdeleted'] = 'Skjul slettede beskeder';
+$labels['showremoteimages'] = 'Vis eksterne indlejrede billeder';
+$labels['fromknownsenders'] = 'fra kendte afsendere';
+$labels['always'] = 'altid';
 $labels['showinlineimages'] = 'Vis vedhæftede billeder under beskeden';
 $labels['autosavedraft'] = 'Gem kladde automatisk';
 $labels['everynminutes'] = 'hver $n. minut';
+$labels['keepaliveevery'] = 'hver $n. minut';
 $labels['never'] = 'aldrig';
 $labels['messagesdisplaying'] = 'Viser beskeder';
 $labels['messagescomposition'] = 'Skriver nye beskeder';
@@ -233,6 +241,8 @@ $labels['2231folding'] = 'Fuld RFC 2231 understøttelse (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 understøttelse (MS Outlook)';
 $labels['2047folding'] = 'Fuld RFC 2047 understøttelse (andre)';
 $labels['advancedoptions'] = 'Advancerede muligheder';
+$labels['focusonnewmessage'] = 'Fokusér browservindue når der kommer nye beskeder';
+$labels['checkallfolders'] = 'Tjek alle mapper for nye beskeder';
 $labels['folder'] = 'Mappe';
 $labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenavn';
@@ -254,3 +264,4 @@ $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
 ?>
+
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index e3926f899..3bedd523f 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -1,21 +1,20 @@
 <?php
 
 /*
++-----------------------------------------------------------------------+
+| language/da_DK/messages.inc                                           |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author : Martin Moeller <martin@liga.dk>                              |
+|         Jesper R. Meyer <jesper@upthere.dk>                           |
+|         Søren Aggeboe <soren@aggeboe.dk>                              |
++-----------------------------------------------------------------------+
 
- +-----------------------------------------------------------------------+
- | language/da/messages.inc                                              |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author : Martin Moeller <martin@liga.dk>                              |
- |         Jesper R. Meyer <jesper@upthere.dk>                           |
- |         Søren Aggeboe <soren@aggeboe.dk>                              |
- +-----------------------------------------------------------------------+
-
- @version $Id$
+@version $Id$
 
 */
 
@@ -42,6 +41,8 @@ $messages['encryptedmessage'] = 'Beskeden er krypteret og kan ikke vises. Beklag
 $messages['nocontactsfound'] = 'Ingen kontakter blev fundet';
 $messages['contactnotfound'] = 'Den søgte kontakt blev ikke fundet';
 $messages['sendingfailed'] = 'Beskeden kunne ikke sendes';
+$messages['senttooquickly'] = 'Vent venligst $sec sekunder før du sender denne besked';
+$messages['errorsavingsent'] = 'Der opstod en fejl da den sendte besked blev gemt';
 $messages['errorsaving'] = 'Der opstod en fejl ved lagring af data';
 $messages['errormoving'] = 'Beskeden kunne ikke flyttes';
 $messages['errordeleting'] = 'Beskeden kunne ikke slettes';
@@ -49,10 +50,15 @@ $messages['deletecontactconfirm'] = 'Vil du virkelig slette den/de valgte kontak
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette den/de valgte besked(er)?';
 $messages['deletefolderconfirm'] = 'Vil du virkelig slette den valgte mappe';
 $messages['purgefolderconfirm'] = 'Vil du virkelig slette alle beskeder i denne mappe?';
+$messages['foldercreating'] = 'Opretter mappen...';
+$messages['folderdeleting'] = 'Sletter mappen...';
+$messages['folderrenaming'] = 'Omdøber mappen...';
+$messages['foldermoving'] = 'Flytter mappen...';
 $messages['formincomplete'] = 'Formularen var ikke fuldstændig fyldt ud';
 $messages['noemailwarning'] = 'Indtast venligst en gyldig e-mail adresse';
 $messages['nonamewarning'] = 'Angiv venligst et navn';
 $messages['nopagesizewarning'] = 'Angiv sidestørrelsen';
+$messages['nosenderwarning'] = 'Indtast venligst afsenders email-adresse';
 $messages['norecipientwarning'] = 'Indtast mindst én modtager';
 $messages['nosubjectwarning'] = '\'Emne\'-feltet er tomt. Kunne du tænke dig at skrive et nu?';
 $messages['nobodywarning'] = 'Send denne besked uden tekst?';
@@ -79,6 +85,16 @@ $messages['movingmessage'] = 'Flytter besked...';
 $messages['receiptsent'] = 'Kvittering for læsning er sendt';
 $messages['errorsendingreceipt'] = 'Kvitteringen kunne ikke sendes';
 $messages['nodeletelastidentity'] = 'Du kan ikke slette denne identitet, da det er den eneste der er tilbage.';
-$messages['addsubfolderhint'] = 'Denne mappe vil blive oprettet som en undermappe af den der er valgt i øjeblikket.';
+$messages['addsubfolderhint'] = 'Denne mappe vil blive oprettet som en undermappe til den mappe der er valgt i øjeblikket.';
+$messages['forbiddencharacter'] = 'Mappe-navnet indeholder ugyldige tegn';
+$messages['selectimportfile'] = 'Vælg venligst den fil der skal uploades';
+$messages['addresswriterror'] = 'Der kan ikke skrives i den valgte adressebog';
+$messages['importwait'] = 'Importerer, vent venligst...';
+$messages['importerror'] = 'Fejl i importen! Den uploadede fil er ikke en gyldig vCard fil.';
+$messages['importconfirm'] = '<b>Importerede $inserted kontakter, sprang over $skipped allerede eksisterende kontakter</b>:<p><em>$names</em></p>';
+$messages['opnotpermitted'] = 'Handlingen er ikke tilladt!';
+$messages['nofromaddress'] = 'Der mangler en email-adresse i den valgte identitet';
+$messages['editorwarning'] = 'Al formatering af teksten forsvinder, hvis der skiftes til ren tekst. Vil du fortsætte?';
 
 ?>
+
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index fae87c558..da2709c70 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -131,6 +131,8 @@ $labels['unknown'] = 'unknown';
 $labels['unlimited'] = 'unlimited';
 $labels['quicksearch'] = 'Quick search';
 $labels['resetsearch'] = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
 $labels['openinextwin'] = 'Open in new window';
 $labels['compose'] = 'Compose a message';
 $labels['savemessage'] = 'Save this draft';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 7f0538703..87cb08b49 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -161,6 +161,8 @@ $labels['unlimited']  = 'unlimited';
 
 $labels['quicksearch']  = 'Quick search';
 $labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
 
 $labels['openinextwin'] = 'Open in new window';
 
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index a02944795..e9ac14987 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -131,6 +131,8 @@ $labels['unknown'] = 'teadmata';
 $labels['unlimited'] = 'piiramatu';
 $labels['quicksearch'] = 'Kiirotsing';
 $labels['resetsearch'] = 'Lähtesta otsing';
+$labels['searchmod'] = 'Otsingu laiendid';
+$labels['msgtext'] = 'Kogu kirjast';
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['compose'] = 'Koosta kiri';
 $labels['savemessage'] = 'Salvesta see mustand';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 105746831..faefcabde 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -5,7 +5,7 @@
 | language/gl_ES/labels.inc                                             |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -158,7 +158,7 @@ $labels['maxuploadsize'] = 'O tamaño máximo permitido de ficheiro é de $size'
 $labels['addcc'] = 'Engadir Copia (CC)';
 $labels['addbcc'] = 'Engadir Copia Oculta (BCC)';
 $labels['addreplyto'] = 'Engadir Respostar a (Reply-To)';
-$labels['mdnrequest'] = 'O remitente desta mensaxe pediu ser notificado cando vostede lea esta mensaxe. Quere notificar ao remitente?';
+$labels['mdnrequest'] = 'O remitente desta mensaxe pediu ser notificado cando vostede a lea. Quere notificar ao remitente?';
 $labels['receiptread'] = 'Notificación da disposición da mensaxe (lectura)';
 $labels['yourmessage'] = 'Esta é unha notificación de disposición para a súa mensaxe';
 $labels['receiptnote'] = 'Nota: Esta notificación só confirma que a mensaxe se abriu no computador do destinatario. Non asegura que o destinatario o lera ou entendera o seu contido.';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 9c9aad8a8..daafd0845 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -5,7 +5,7 @@
 | language/gl_ES/messages.inc                                           |
 |                                                                       |
 | Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -40,8 +40,8 @@ $messages['sendingfailed'] = 'Fallou o envío da mensaxe';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundos antes de enviar esta mensaxe';
 $messages['errorsavingsent'] = 'Ocurriu un erro mentres se gardaba a mensaxe enviada';
 $messages['errorsaving'] = 'Ocurriu un erro mentres se gardaba';
-$messages['errormoving'] = 'Non puiden mover a mensaxe';
-$messages['errordeleting'] = 'Non puiden eliminar a mensaxe';
+$messages['errormoving'] = 'Non se puido mover a mensaxe';
+$messages['errordeleting'] = 'Non se puido eliminar a mensaxe';
 $messages['deletecontactconfirm'] = 'Quere eliminar o(s) contacto(s) seleccionado(s)?';
 $messages['deletemessagesconfirm'] = 'Quere eliminar a(s) mensaxe(s) seleccionadas?';
 $messages['deletefolderconfirm'] = 'Quere eliminar este cartafol?';
@@ -70,13 +70,13 @@ $messages['nospellerrors'] = 'Non hai erros ortográficos';
 $messages['folderdeleted'] = 'Eliminouse correctamente o cartafol';
 $messages['deletedsuccessfully'] = 'Eliminouse correctamente';
 $messages['converting'] = 'Eliminando o formato da mensaxe...';
-$messages['messageopenerror'] = 'Non puiden cargar a mensaxe desde o servidor';
+$messages['messageopenerror'] = 'Non se puido cargar a mensaxe desde o servidor';
 $messages['fileuploaderror'] = 'Fallou a carga do ficheiro';
 $messages['filesizeerror'] = 'O ficheiro cargado é máis grande que o tamaño máximo de $size';
 $messages['copysuccess'] = 'Copiáronse correctamente $nr enderezos';
-$messages['copyerror'] = 'Non puiden copiar ningún enderezo';
+$messages['copyerror'] = 'Non se puido copiar ningún enderezo';
 $messages['sourceisreadonly'] = 'A orixe é de só lectura';
-$messages['errorsavingcontact'] = 'Non puiden gardar o contacto';
+$messages['errorsavingcontact'] = 'Non se puido gardar o contacto';
 $messages['movingmessage'] = 'Movendo mensaxe...';
 $messages['receiptsent'] = 'A notificación de disposición enviouse correctamente';
 $messages['errorsendingreceipt'] = 'Non se puido enviar a notificación de disposición';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index d9c944645..3a47ac984 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -1,19 +1,18 @@
 <?php
 
 /*
++-----------------------------------------------------------------------+
+| language/hy_AM/labels.inc                                             |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Vahan Yerkanian <vahan@arminco.com>                           |
++-----------------------------------------------------------------------+
 
- +-----------------------------------------------------------------------+
- | language/am/labels.inc                                                |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@arminco.com>                           |
- +-----------------------------------------------------------------------+
-
- @version $Id$
+@version $Id$
 
 */
 
@@ -68,6 +67,30 @@ $labels['wednesday'] = 'Չորեքշաբթի';
 $labels['thursday'] = 'Հինգշաբթի';
 $labels['friday'] = 'Ուրբաթ';
 $labels['saturday'] = 'Շաբաթ';
+$labels['jan'] = 'Հնվ';
+$labels['feb'] = 'Փետ';
+$labels['mar'] = 'Մար';
+$labels['apr'] = 'Ապր';
+$labels['may'] = 'Մայ';
+$labels['jun'] = 'Հուս';
+$labels['jul'] = 'Հուլ';
+$labels['aug'] = 'Օգս';
+$labels['sep'] = 'Սեպ';
+$labels['oct'] = 'Հոկ';
+$labels['nov'] = 'Նոյ';
+$labels['dec'] = 'Դեկ';
+$labels['longjan'] = 'Հունվար';
+$labels['longfeb'] = 'Փետրվար';
+$labels['longmar'] = 'Մարտ';
+$labels['longapr'] = 'Ապրիլ';
+$labels['longmay'] = 'Մայիս';
+$labels['longjun'] = 'Հունիս';
+$labels['longjul'] = 'Հուլիս';
+$labels['longaug'] = 'Օգոստոս';
+$labels['longsep'] = 'Սեպտեմբեր';
+$labels['longoct'] = 'Հոկտեմբեր';
+$labels['longnov'] = 'Նոյեմբեր';
+$labels['longdec'] = 'Դեկտեմբեր';
 $labels['today'] = 'Այսօր';
 $labels['checkmail'] = 'Ստուգել նոր նամակները';
 $labels['writenewmessage'] = 'Նոր նամակ';
@@ -90,10 +113,15 @@ $labels['viewsource'] = 'Ցուցադրել նամակի կոդը';
 $labels['markmessages'] = 'Նշել նամակները';
 $labels['markread'] = 'որպես կարդացած';
 $labels['markunread'] = 'որպես չկարդացած';
+$labels['markflagged'] = 'որպես նշված';
+$labels['markunflagged'] = 'որպես չնշված';
 $labels['select'] = 'Նշել';
 $labels['all'] = 'Բոլորը';
 $labels['none'] = 'Չնշել';
 $labels['unread'] = 'Չկարդացածը';
+$labels['flagged'] = 'Նշված';
+$labels['unanswered'] = 'Անպատասխան';
+$labels['filter'] = 'Զտիչ';
 $labels['compact'] = 'Սեղմել';
 $labels['empty'] = 'Դատարկել';
 $labels['purge'] = 'Մաքրել';
@@ -102,6 +130,7 @@ $labels['unknown'] = 'անհայտ';
 $labels['unlimited'] = 'անսահմանափակ';
 $labels['quicksearch'] = 'Արագ որոնում';
 $labels['resetsearch'] = 'Վերսկսել որոնումը';
+$labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['compose'] = 'Գրել նամակ';
 $labels['savemessage'] = 'Հիշել որպես սևագիր';
 $labels['sendmessage'] = 'Ուղարկել';
@@ -122,8 +151,12 @@ $labels['high'] = 'Կարևոր';
 $labels['highest'] = 'Կարևորագույն';
 $labels['nosubject'] = '(առանց վերնագրի)';
 $labels['showimages'] = 'Ցուցադրել նկարները';
+$labels['alwaysshow'] = 'Միշտ ցուցադրել պատկերները $sender–ից';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Պարզ տեքստ';
+$labels['savesentmessagein'] = 'Գրանցել ուղարկված նամակը';
+$labels['dontsave'] = 'Չ՛գրանցել';
+$labels['maxuploadsize'] = 'Առավելագույն թույլատրելի ֆայլի չափը $size է';
 $labels['addcc'] = 'Ավելացնել Cc';
 $labels['addbcc'] = 'Ավելացնել Bcc';
 $labels['addreplyto'] = 'Ավելացնել Reply-To';
@@ -147,12 +180,19 @@ $labels['composeto'] = 'Գրել նամակ';
 $labels['contactsfromto'] = 'Հասցեներ $from–ից $to–ը եղած $count–ից';
 $labels['print'] = 'Տպել';
 $labels['export'] = 'Արտահանել';
+$labels['exportvcards'] = 'Արտահանել հասցեները vCard չափաձևով';
 $labels['previouspage'] = 'Ցուցադրել նախորդ էջը';
 $labels['firstpage'] = 'Ցուցադրել առաջին էջը';
 $labels['nextpage'] = 'Ցուցադրել հաջորդ էջը';
 $labels['lastpage'] = 'Ցուցադրել վերջին էջը';
 $labels['groups'] = 'Խմբեր';
 $labels['personaladrbook'] = 'Անձնական հասցեներ';
+$labels['import'] = 'Ներկրել';
+$labels['importcontacts'] = 'Ներկրել հասցեներ';
+$labels['importfromfile'] = 'Ներկրել ֆայլից';
+$labels['importreplace'] = 'Փոխել ողջ հասցեագիրքը';
+$labels['importtext'] = 'Դուք կարող եք ներկրել նոր հասցեներ առկա հասցեագրքից։ Համակարգը ընդունում է հասցեների ներկրումը <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> չափաձևով։';
+$labels['done'] = 'Ավարտված է';
 $labels['settingsfor'] = 'Նախասիրություններ';
 $labels['preferences'] = 'Ընդհանուր';
 $labels['userpreferences'] = 'Օգտվողի նախասիրություններ';
@@ -163,6 +203,7 @@ $labels['newidentity'] = 'Նոր անձ';
 $labels['newitem'] = 'Նոր իր';
 $labels['edititem'] = 'Խմբագրել իրը';
 $labels['setdefault'] = 'Հիմնական';
+$labels['autodetect'] = 'Ավտո';
 $labels['language'] = 'Լեզու';
 $labels['timezone'] = 'Ժամային գոտի';
 $labels['pagesize'] = 'Տողեր առ էջ';
@@ -171,9 +212,37 @@ $labels['dstactive'] = 'Ամառային ժամանակ';
 $labels['htmleditor'] = 'Ստեղծել HTML նամակներ';
 $labels['htmlsignature'] = 'HTML ստորագրություն';
 $labels['previewpane'] = 'Ցուցադրել պատուհանը';
+$labels['skin'] = 'Տեսքի տարբերակ';
+$labels['logoutclear'] = 'Դուրս գալուց դատարկել աղբարկղը';
+$labels['logoutcompact'] = 'Դուրս գալուց կարգի բերել փոստարկղը';
+$labels['uisettings'] = 'Տեսք';
+$labels['serversettings'] = 'Սերվերի կարգավորումներ';
+$labels['mailboxview'] = 'Փոստարկղի տեսք';
+$labels['mdnrequests'] = 'Տեղեկացումներ';
+$labels['askuser'] = 'Հարցնել օգտվողին';
+$labels['autosend'] = 'ուղարկել ավտոմատ';
+$labels['ignore'] = 'անտեսել';
+$labels['readwhendeleted'] = 'Ջնջելուց նշել նամակը որպես կարդացած';
+$labels['flagfordeletion'] = 'Ջնջելու փոխարեն նշել որպես ենթակա ջնջման ';
+$labels['skipdeleted'] = 'Ցույց չ՛տալ ջնջված նամակները';
+$labels['showremoteimages'] = 'Ցույց տալ հեռակա պատկերները';
+$labels['fromknownsenders'] = 'հայտնի հասցեատերերից';
+$labels['always'] = 'միշտ';
+$labels['showinlineimages'] = 'Ցուցադրել կցված պատկերները հաղորդագրության տակ';
 $labels['autosavedraft'] = 'Սևագրի ավտոմատ գրանցում';
 $labels['everynminutes'] = 'ամեն $n րոպեն';
+$labels['keepaliveevery'] = 'ամեն $n րոպեն';
+$labels['keepalive'] = 'Ստուգել նոր նամակները';
 $labels['never'] = 'երբեք';
+$labels['messagesdisplaying'] = 'նամակները ցուցադրելիս';
+$labels['messagescomposition'] = 'նամակ գրելիս';
+$labels['mimeparamfolding'] = 'Կցորդների անուններ';
+$labels['2231folding'] = 'Կատարյալ RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Կատարյալ RFC 2047 (այլ)';
+$labels['advancedoptions'] = 'Հավելյալ կարգավորումներ';
+$labels['focusonnewmessage'] = 'Առաջ բերել պատուհանը նոր նամակ ստանալիս';
+$labels['checkallfolders'] = 'Ստուգել բոլոր դարակները նոր նամակների համար';
 $labels['folder'] = 'Դարակ';
 $labels['folders'] = 'Դարակներ';
 $labels['foldername'] = 'Դարակի անուն';
@@ -185,8 +254,13 @@ $labels['rename'] = 'Վերանվանել';
 $labels['renamefolder'] = 'Վերանվանել դարակը';
 $labels['deletefolder'] = 'Ջնջել դարակը';
 $labels['managefolders'] = 'Կարգավորել դարակները';
+$labels['specialfolders'] = 'Հատուկ դարակներ';
 $labels['sortby'] = 'Դասավորել';
 $labels['sortasc'] = 'ըստ աճման';
 $labels['sortdesc'] = 'ըստ նվազման';
+$labels['B'] = 'Բ';
+$labels['KB'] = 'ԿԲ';
+$labels['MB'] = 'ՄԲ';
+$labels['GB'] = 'ԳԲ';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index 861f17a3c..41919cf89 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -1,19 +1,18 @@
 <?php
 
 /*
++-----------------------------------------------------------------------+
+| language/hy_AM/messages.inc                                           |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Vahan Yerkanian <vahan@arminco.com>                           |
++-----------------------------------------------------------------------+
 
- +-----------------------------------------------------------------------+
- | language/am/messages.inc                                              |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@arminco.com>                           |
- +-----------------------------------------------------------------------+
-
- @version $Id$
+@version $Id$
 
 */
 
@@ -40,6 +39,8 @@ $messages['encryptedmessage'] = 'Ներողություն, այս նամակը �
 $messages['nocontactsfound'] = 'Հասցեներ չկան';
 $messages['contactnotfound'] = 'Որոնվող հասցեն չգտնվեց';
 $messages['sendingfailed'] = 'Նամակի ուղարկումը ձախողվեց';
+$messages['senttooquickly'] = 'Խնդրում ենք սպասել $sec վարկյան մինչ այս նամակն ուղարկելը';
+$messages['errorsavingsent'] = 'Ուղարկված նամակի արխիվացումը խափանվեց';
 $messages['errorsaving'] = 'Գրանցման սխալ';
 $messages['errormoving'] = 'Նամակի տեղափոխման ձախողում';
 $messages['errordeleting'] = 'Նամակի ջնջման ձախողում';
@@ -47,10 +48,15 @@ $messages['deletecontactconfirm'] = 'Ուզու՞մ էք ջնջել նշված �
 $messages['deletemessagesconfirm'] = 'Ուզու՞մ էք ջնջել նշված նամակները';
 $messages['deletefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակը';
 $messages['purgefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակի բոլոր նամակները';
+$messages['foldercreating'] = 'Դարակը ստեղծվում է…';
+$messages['folderdeleting'] = 'Դարակը ջնջվում է…';
+$messages['folderrenaming'] = 'Դարակը վերանվանվում է…';
+$messages['foldermoving'] = 'Դարակը տեղափոխվում է…';
 $messages['formincomplete'] = 'Ձևը թերի է լրացված';
 $messages['noemailwarning'] = 'Մուտքագրեք ճիշտ էլ. հասցե';
 $messages['nonamewarning'] = 'Մուտքագրեք անուն';
 $messages['nopagesizewarning'] = 'Մուտքագրեք էջի չափս';
+$messages['nosenderwarning'] = 'Մուտքագրեք հասցեատիրոջ հասցեն';
 $messages['norecipientwarning'] = 'Մուտքագրեք նվազագույնը մեկ հասցեատեր';
 $messages['nosubjectwarning'] = 'Վերնագիր բացակայում է, ցանկանո՞ւմ եք լրացնել';
 $messages['nobodywarning'] = 'Ուղարկե՞լ այս նամակը դատարկ';
@@ -78,5 +84,14 @@ $messages['receiptsent'] = 'Նամակի ընթերցման ծանուցագիր
 $messages['errorsendingreceipt'] = 'Ծանուցագրի ուղարկումը ձախողվեց';
 $messages['nodeletelastidentity'] = 'Անհնար է ջնջել վերջին տարբերակը';
 $messages['addsubfolderhint'] = 'Այս դարակը կստեղծվի որպես նշվածի ենթադարակ';
+$messages['forbiddencharacter'] = 'Դարակի անունը պարունակում է անթույլատրելի նշան';
+$messages['selectimportfile'] = 'Ընտրեք ուղարկվող ֆայլը';
+$messages['addresswriterror'] = 'Ընտրված հասցեագիրքը ենթակա չէ փոփոխման';
+$messages['importwait'] = 'Ներկրումն ընթացքի մեջ է...';
+$messages['importerror'] = 'Ներկրումը խափանվեց։ Ներկրված ֆայլը vCard չափաձևի չէ։';
+$messages['importconfirm'] = '$inserted նոր ներկրված հասցեներ, $skipped արդեն առկա հասցեներ՝ <p><em>$names</em></p>';
+$messages['opnotpermitted'] = 'Գործողությունը անթույլատրելի է։';
+$messages['nofromaddress'] = 'Նշված անձը հասցե չունի։';
+$messages['editorwarning'] = 'Դեպի պարզ տեքստի խմբագրիչ անցման դեպքում կկորի տեքստի ձևավորումը։ Շարունակե՞լ։';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 7f52479a7..60d330b75 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -193,6 +193,7 @@ $labels['importcontacts'] = 'Import kontak';
 $labels['importfromfile'] = 'Import dari berkas:';
 $labels['importreplace'] = 'Ganti seluruh buku alamat';
 $labels['importtext'] = 'Anda bisa mengunggah kontak dari buku alamat yang sudah ada.<br/>Kami kebetulan mendukung pengimportan alamat dari format data <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
+$labels['done'] = 'Selesai';
 $labels['settingsfor'] = 'Pengaturan untuk';
 $labels['preferences'] = 'Pilihan';
 $labels['userpreferences'] = 'Pilihan pengguna';
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 4a243eef5..5b6ccc842 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -68,6 +68,7 @@ $rcube_languages = array(
   'lt_LT' => 'Lithuanian',
   'mk_MK' => 'Macedonian',
   'ms_MY' => 'Malay',
+  'mr_IN' => 'Marathi',
   'nl_NL' => 'Nederlands',
   'ne_NP' => 'Nepali',
   'nb_NO' => 'Norsk (Bokmål)',
@@ -117,6 +118,7 @@ $rcube_language_aliases = array(
   'ne' => 'ne_NP',
   'no' => 'nn_NO',
   'ms' => 'ms_MY',
+  'mr' => 'mr_IN',
   'pl' => 'pl_PL',
   'tw' => 'zh_TW',
   'si' => 'si_LK',
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index d5c5668b4..67f1edd3f 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -121,6 +121,9 @@ $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
 $labels['unread'] = 'Non letti';
+$labels['flagged'] = 'Contrassegnati';
+$labels['unanswered'] = 'Senza risposta';
+$labels['filter'] = 'Filtra';
 $labels['compact'] = 'Compatta';
 $labels['empty'] = 'Svuota';
 $labels['purge'] = 'Pulisci';
@@ -153,7 +156,7 @@ $labels['showimages'] = 'Visualizza immagini';
 $labels['alwaysshow'] = 'Mostra sempre immagini da $sender';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testo semplice';
-$labels['savesentmessagein'] = 'Salva messaggi inviati in';
+$labels['savesentmessagein'] = 'Salva i messaggi inviati in';
 $labels['dontsave'] = 'non salvare';
 $labels['maxuploadsize'] = 'La dimensione massima consentita è $size';
 $labels['addcc'] = 'Aggiungi Cc';
@@ -190,7 +193,7 @@ $labels['import'] = 'Importa';
 $labels['importcontacts'] = 'Importa contatti';
 $labels['importfromfile'] = 'Importa da file:';
 $labels['importreplace'] = 'Sostituisci l\'intera rubrica';
-$labels['importtext'] = 'Puoi caricare i contatti da una rubrica esistente.Al momento è supportata l\'importazione dei contatti dal formato vCard.';
+$labels['importtext'] = 'Puoi caricare i contatti da una rubrica esistente. Al momento è supportata l\'importazione dei contatti dal formato vCard.';
 $labels['done'] = 'Fatto';
 $labels['settingsfor'] = 'Impostazioni per ';
 $labels['preferences'] = 'Preferenze';
@@ -217,18 +220,21 @@ $labels['logoutcompact'] = 'Compatta la Posta In Arrivo all\'uscita';
 $labels['uisettings'] = 'Interfaccia Utente';
 $labels['serversettings'] = 'Impostazioni Server';
 $labels['mailboxview'] = 'Vista Messaggi';
-$labels['mdnrequests'] = 'Notifiche Lettura';
+$labels['mdnrequests'] = 'Notifiche di lettura';
 $labels['askuser'] = 'chiedi all\'utente';
 $labels['autosend'] = 'invia automaticamente';
 $labels['ignore'] = 'ignora';
-$labels['readwhendeleted'] = 'Segna il messaggio come letto all\'eliminazione';
-$labels['flagfordeletion'] = 'Segna il messaggio per l\'eliminazione invece che eliminare';
-$labels['skipdeleted'] = 'Non mostrare messaggi eliminati';
+$labels['readwhendeleted'] = 'Marca il messaggio come letto prima di eliminarlo';
+$labels['flagfordeletion'] = 'Marca il messaggio come eliminato invece di eliminarlo';
+$labels['skipdeleted'] = 'Non mostrare i messaggi marcati come eliminati';
+$labels['showremoteimages'] = 'Mostra immagini remote contenute nel messaggio';
+$labels['fromknownsenders'] = 'da mittenti conosciuti';
+$labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra immagini allegate sotto il messaggio';
 $labels['autosavedraft'] = 'Salva le bozze automaticamente';
 $labels['everynminutes'] = 'ogni $n minuti';
 $labels['keepaliveevery'] = 'ogni $n minuto(i)';
-$labels['keepalive'] = 'Verificare la presenza di nuovi messaggi su';
+$labels['keepalive'] = 'Controlla la presenza di nuovi messaggi';
 $labels['never'] = 'mai';
 $labels['messagesdisplaying'] = 'Visualizzazione Messaggi';
 $labels['messagescomposition'] = 'Composizione Messaggi';
@@ -237,7 +243,8 @@ $labels['2231folding'] = 'RFC 2231 completo (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 completo (altri)';
 $labels['advancedoptions'] = 'Opzioni avanzate';
-$labels['focusonnewmessage'] = 'Finestra del browser sul nuovo messaggio';
+$labels['focusonnewmessage'] = 'Attiva la finestra del browser all\'arrivo di un nuovo messaggio';
+$labels['checkallfolders'] = 'Controlla tutte le cartelle per la presenza di nuovi messaggi';
 $labels['folder'] = 'Cartella';
 $labels['folders'] = 'Cartelle';
 $labels['foldername'] = 'Nome cartella';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 49b415a7d..1ff4b55df 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -1,19 +1,18 @@
 <?php
 
 /*
++-----------------------------------------------------------------------+
+| localization/ka_GE/labels.inc                                         |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Zaza Zviadadze <zviadadze@gmail.com>                          |
++-----------------------------------------------------------------------+
 
- +-----------------------------------------------------------------------+
- | language/ge/labels.inc                                                |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Zaza Zviadadze <zviadadze@gmail.com>                          |
- +-----------------------------------------------------------------------+
-
- @version $Id: labels.inc 842 2007-10-20 13:55:02Z  zaza$
+@version $Id: labels.inc 842 2009-03-16 01:00:02Z  zaza$
 
 */
 
@@ -68,6 +67,30 @@ $labels['wednesday'] = 'ოთხშაბათი';
 $labels['thursday'] = 'ხუთშაბათი';
 $labels['friday'] = 'პარასკევი';
 $labels['saturday'] = 'შაბათი';
+$labels['jan'] = 'იან';
+$labels['feb'] = 'თებ';
+$labels['mar'] = 'მარ';
+$labels['apr'] = 'აპრ';
+$labels['may'] = 'მაი';
+$labels['jun'] = 'ივნ';
+$labels['jul'] = 'ივლ';
+$labels['aug'] = 'აგვ';
+$labels['sep'] = 'სექ';
+$labels['oct'] = 'ოქტ';
+$labels['nov'] = 'ნოე';
+$labels['dec'] = 'დეკ';
+$labels['longjan'] = 'იანვარი';
+$labels['longfeb'] = 'თებერვალი';
+$labels['longmar'] = 'მარტი';
+$labels['longapr'] = 'აპრილი';
+$labels['longmay'] = 'მაისი';
+$labels['longjun'] = 'ივნისი';
+$labels['longjul'] = 'ივლისი';
+$labels['longaug'] = 'აგვისტო';
+$labels['longsep'] = 'სექტემბერი';
+$labels['longoct'] = 'ოქტომბერი';
+$labels['longnov'] = 'ნოემბერი';
+$labels['longdec'] = 'დეკემბერი';
 $labels['today'] = 'დღეს';
 $labels['checkmail'] = 'შემოწმება ახალ შეტყობინებაზე';
 $labels['writenewmessage'] = 'ახალი შეტყობინება';
@@ -90,10 +113,15 @@ $labels['viewsource'] = 'შიგთავსი';
 $labels['markmessages'] = 'მონიშნეთ შეტყობინებები';
 $labels['markread'] = 'როგორც წაკითხული';
 $labels['markunread'] = 'როგორც წაუკითხავი';
+$labels['markflagged'] = 'როგორც მონიშნული';
+$labels['markunflagged'] = 'როგორც მოუნიშნავი';
 $labels['select'] = 'მონიშვნა';
 $labels['all'] = 'ყველა';
 $labels['none'] = 'არცერთი';
 $labels['unread'] = 'წაუკითხავი';
+$labels['flagged'] = 'მონიშნული';
+$labels['unanswered'] = 'უპასუხო';
+$labels['filter'] = 'ფილტრი';
 $labels['compact'] = 'შეკუმშვა';
 $labels['empty'] = 'გაცარიელება';
 $labels['purge'] = 'გასუფთავება';
@@ -102,6 +130,7 @@ $labels['unknown'] = 'უცნობი';
 $labels['unlimited'] = 'შეუზღუდავი';
 $labels['quicksearch'] = 'სწრაფი ძიება';
 $labels['resetsearch'] = 'ძიების გასუფთავება';
+$labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['compose'] = 'შეტყობინების დაწერა';
 $labels['savemessage'] = 'დროებით შენახვა';
 $labels['sendmessage'] = 'შეტყობინების გაგზავნა';
@@ -122,8 +151,12 @@ $labels['high'] = 'მაღალი';
 $labels['highest'] = 'უმაღლესი';
 $labels['nosubject'] = '(უსათაურო)';
 $labels['showimages'] = 'გამოსახულების ჩვენება';
+$labels['alwaysshow'] = 'ყოველთვის გამოაჩინე სურათები $sender –გან';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ტექსტური';
+$labels['savesentmessagein'] = 'შეინახე შეტყობინება';
+$labels['dontsave'] = 'არ შეინახო';
+$labels['maxuploadsize'] = 'მაქსიმალური დაშვებული ფაილის ზომა $size';
 $labels['addcc'] = 'დაამატე კოპიო';
 $labels['addbcc'] = 'დაამატე ფარული კოპიო';
 $labels['addreplyto'] = 'დაამატე გამომგზავნი';
@@ -147,12 +180,19 @@ $labels['composeto'] = 'ფოსტის გაგზავნა შერჩ
 $labels['contactsfromto'] = 'კონტაქტები $from დან $to ში $count';
 $labels['print'] = 'დაბეჭვდა';
 $labels['export'] = 'ექსპორტი';
+$labels['exportvcards'] = 'კონტაქტების ექსპორტი vCard ფორმატში';
 $labels['previouspage'] = 'წინას ჩვენება';
 $labels['firstpage'] = 'პირველის ჩვენება';
 $labels['nextpage'] = 'შემდეგის ჩვენება';
 $labels['lastpage'] = 'ბოლოს ჩვენება';
 $labels['groups'] = 'ჯგუფები';
 $labels['personaladrbook'] = 'პერსონალური მისამართები';
+$labels['import'] = 'შემოტანა';
+$labels['importcontacts'] = 'კონტაქტების შემოტანა';
+$labels['importfromfile'] = 'შემოტანა ფაილიდან:';
+$labels['importreplace'] = 'ჩაანაცვლეთ არსებული მისამართები';
+$labels['importtext'] = 'თქვენ შეგიძლიათ ატვირთოთ კონტაქტები აღნიშნული მისამართიდან. <br/> ჩვენ შეგვიძლია მივიღოთ მისამართები <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> მონაცემთა ფორმატში.';
+$labels['done'] = 'დასრულებულია';
 $labels['settingsfor'] = 'პარამეტრები';
 $labels['preferences'] = 'პარამეტრები';
 $labels['userpreferences'] = 'მომხმარებლის პარამეტრები';
@@ -163,6 +203,7 @@ $labels['newidentity'] = 'ახალი პროფილი';
 $labels['newitem'] = 'ახალი';
 $labels['edititem'] = 'რედაქტირება';
 $labels['setdefault'] = 'როგორც ზოგაგად';
+$labels['autodetect'] = 'ავტომატური';
 $labels['language'] = 'ენა';
 $labels['timezone'] = 'დროითი ზონა';
 $labels['pagesize'] = 'სტრიქონი გვერდზე';
@@ -171,13 +212,41 @@ $labels['dstactive'] = 'დროის გადაყვანა';
 $labels['htmleditor'] = 'შეტყობინების შექმნა HTML –ში';
 $labels['htmlsignature'] = 'HTML ხელმოწერა';
 $labels['previewpane'] = 'ჩვენება';
+$labels['skin'] = 'ინტერფეისი';
+$labels['logoutclear'] = 'წაშლილების გასუფთავება გამოსვლისას';
+$labels['logoutcompact'] = 'მიღებულების შეკუმშვა გამოსვლისას';
+$labels['uisettings'] = 'მომხმარებლის ინტერფეისი';
+$labels['serversettings'] = 'სერვერის პარამეტრები';
+$labels['mailboxview'] = 'საფოსტო ყუთის ჩვენება';
+$labels['mdnrequests'] = 'მგზავნელის შეტყობინებები';
+$labels['askuser'] = 'ჰკითხე მომხმარებელს';
+$labels['autosend'] = 'გაგზავნე ავტომატურად';
+$labels['ignore'] = 'იგნორირება';
+$labels['readwhendeleted'] = 'მონიშნე გზავნილი წაკითხულად წაშლის დროს';
+$labels['flagfordeletion'] = 'აღნიშნეთ გზავნილები როგორც წასაშლელი წაშლის ნაცვლად';
+$labels['skipdeleted'] = 'არ გამოაჩინო წაშლილი გზავნილები';
+$labels['showremoteimages'] = 'გამოაჩინე მოშორებული სურათები';
+$labels['fromknownsenders'] = 'ნაცნობი მგზავნელებისგან';
+$labels['always'] = 'ყოველთვის';
+$labels['showinlineimages'] = 'ატვირთული სურათები გამოაჩინე გზავნილის ქვემოთ';
 $labels['autosavedraft'] = 'ავტომატური შენახვა';
 $labels['everynminutes'] = 'ყოველ $n წუთში';
+$labels['keepaliveevery'] = 'ყოველ $n წუთში';
+$labels['keepalive'] = 'შეამოწმე ახალ შეტყობინებაზე';
 $labels['never'] = 'არასდროს';
+$labels['messagesdisplaying'] = 'გამოაჩინე შეტყობინებები';
+$labels['messagescomposition'] = 'შეტყობინებების შექმნა';
+$labels['mimeparamfolding'] = 'ბმულის სახელები';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['advancedoptions'] = 'დამატებითი პარამეტრები';
+$labels['focusonnewmessage'] = 'ფოკუსირება ახალ შეტყობინებებზე';
+$labels['checkallfolders'] = 'შეამოწმე ყველა საქაღალდე ახალ შეტყობინებაზე';
 $labels['folder'] = 'საქაღალდე';
 $labels['folders'] = 'საქაღალდეები';
 $labels['foldername'] = 'საქაღალდის დასახელება';
-$labels['subscribed'] = 'გამოცერილია';
+$labels['subscribed'] = 'გამოწერილია';
 $labels['messagecount'] = 'შეტყობინებები';
 $labels['create'] = 'შექმნა';
 $labels['createfolder'] = 'საქაღალდის შექმნა';
@@ -185,8 +254,13 @@ $labels['rename'] = 'სახელის გადარქმევა';
 $labels['renamefolder'] = 'სახელის გადარქმევა საქაღალდისთვის';
 $labels['deletefolder'] = 'საქაღალდის წაშლა';
 $labels['managefolders'] = 'საქაღალდეების მართვა';
+$labels['specialfolders'] = 'სპეციალური საქაღალდე';
 $labels['sortby'] = 'დალაგება';
 $labels['sortasc'] = 'დალაგება ზრდადობით';
 $labels['sortdesc'] = 'დალაგება კლებადობით';
+$labels['B'] = 'ბ';
+$labels['KB'] = 'კბ';
+$labels['MB'] = 'მბ';
+$labels['GB'] = 'გბ';
 
 ?>
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 43456d634..81b4bce62 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -1,19 +1,18 @@
 <?php
 
 /*
++-----------------------------------------------------------------------+
+| localization/ka_GE/messages.inc                                       |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Zaza Zviadadze <zviadadze@gmail.com>                          |
++-----------------------------------------------------------------------+
 
- +-----------------------------------------------------------------------+
- | language/ge/messages.inc                                              |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Zaza Zviadadze <zviadadze@gmail.com>                          |
- +-----------------------------------------------------------------------+
-
- @version $Id: labels.inc 842 2007-10-20 13:55:02Z  zaza $
+@version $Id: labels.inc 842 2009-03-16 01:00:02Z  zaza$
 
 */
 
@@ -40,6 +39,8 @@ $messages['encryptedmessage'] = 'შეტყობინება დაში�
 $messages['nocontactsfound'] = 'კონტაქტი ვერ მოიძებნა';
 $messages['contactnotfound'] = 'მოთხოვნილი კონტაქტი ვერ მოიძებნა';
 $messages['sendingfailed'] = 'შეტყობინება ვერ გაიგზავნა';
+$messages['senttooquickly'] = 'გთხოვთ მოიცადოთ $sec წამი. სანამ იგზავნება შეტყობინება';
+$messages['errorsavingsent'] = 'შეცდომა სანამ ინახება გაგზავნილი შეტყობინება';
 $messages['errorsaving'] = 'შენახვის დროს მოხდა შეცდომა';
 $messages['errormoving'] = 'შეტყობინების გადატანა შეუძლებელია';
 $messages['errordeleting'] = 'შეტყობინების წაშლა შეუძლებელია';
@@ -47,10 +48,15 @@ $messages['deletecontactconfirm'] = 'ნამდვილად გსურთ
 $messages['deletemessagesconfirm'] = 'ნამდვილად გსურთ მონიშნული შეტყობინებების წაშლა?';
 $messages['deletefolderconfirm'] = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
 $messages['purgefolderconfirm'] = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
+$messages['foldercreating'] = 'საქაღალდის შექმნა';
+$messages['folderdeleting'] = 'საქაღალდის წაშლა';
+$messages['folderrenaming'] = 'საქაღალდის სახელის შეცვლა';
+$messages['foldermoving'] = 'საქაღალდის გადატანა';
 $messages['formincomplete'] = 'ყველა ველი არ არის შევსებული';
 $messages['noemailwarning'] = 'მიუთითეთ სწორი ელ–ფოსტის მისამართი';
 $messages['nonamewarning'] = 'მიუთითეთ სახელი';
 $messages['nopagesizewarning'] = 'მიუთითეთ ფურცლის ზომა';
+$messages['nosenderwarning'] = 'გთხოვთ შეიტანოთ მგზავნელის ელ–ფოსტის მისამართი';
 $messages['norecipientwarning'] = 'მიუთითეთ მიმღები';
 $messages['nosubjectwarning'] = 'გსურთ თუ არა შეტყობინების გაგზავნა უსათაუროდ?';
 $messages['nobodywarning'] = 'გსურთ თუ არა შეტყობინების გაგზავნა უტექსტოდ?';
@@ -78,5 +84,14 @@ $messages['receiptsent'] = 'წარმატებით გაიგზავ
 $messages['errorsendingreceipt'] = 'არ გაიგზავნა';
 $messages['nodeletelastidentity'] = 'წაშლა შეუძლებელია, ის თქვენთვის ერთადერთია';
 $messages['addsubfolderhint'] = 'საქაღალდე შეიქმნება როგორც ქვესაქაღალდე მონიშნულ საქაღალდეში';
+$messages['forbiddencharacter'] = 'საქაღალდის სახელი შეიცავს აკრძალულ სიმბოლოებს';
+$messages['selectimportfile'] = 'გთხოვთ მონიშნოთ ფაილი ასატვირთად';
+$messages['addresswriterror'] = 'მონიშნულ მისამართებში ჩაწერა შეუძლებელია';
+$messages['importwait'] = 'გთხოვთ მოიცადოთ, მიმდინარეობს შემოტანა';
+$messages['importerror'] = 'შემოტანა გაუქმდა! ატვირთული ფაილის ფორმატი არ ემთხვევა დასაშვებ vCard ფორმატს';
+$messages['importconfirm'] = '<b>წარმატებით დასრულდა $inserted კონტაქტების შემოტანა, $skipped არსებულის გამოტოვება</b>:<p><em>$names</em></p>';
+$messages['opnotpermitted'] = 'ოპერაცია შეზღუდულია';
+$messages['nofromaddress'] = 'ელ–ფოსტის მისამართი გამოტოვებულია';
+$messages['editorwarning'] = 'რედაქტორის გადართვა ტექსტურ რეჟიმში გამოიწვევს არსებული ტექსტის ფორმატის დაკარგვას. გსურთ გაგრძელება?';
 
 ?>
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index d79319e28..caee04c18 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -2,19 +2,20 @@
 
 /*
 
- +-----------------------------------------------------------------------+
- | language/lv/labels.inc                                                |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Rudolfs Osins <dev.random@gmail.com>                          |
- |         Mikelis Zalais <mik@prog.lv>                                  |
- +-----------------------------------------------------------------------+
++-----------------------------------------------------------------------+
+| language/lv/labels.inc                                                |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Rudolfs Osins <dev.random@gmail.com>                          |
+|         Mikelis Zalais <mik@prog.lv>                                  |
+|         Lauris Bukšis-Haberkorns <lauris@nix.lv>                      |
++-----------------------------------------------------------------------+
 
- @version $Id$
+@version $Id$
 
 */
 
@@ -69,6 +70,30 @@ $labels['wednesday'] = 'Trešdiena';
 $labels['thursday'] = 'Ceturtdiena';
 $labels['friday'] = 'Piektdiena';
 $labels['saturday'] = 'Sestdiena';
+$labels['jan'] = 'Jan';
+$labels['feb'] = 'Feb';
+$labels['mar'] = 'Mar';
+$labels['apr'] = 'Apr';
+$labels['may'] = 'Mai';
+$labels['jun'] = 'Jūn';
+$labels['jul'] = 'Jūl';
+$labels['aug'] = 'Aug';
+$labels['sep'] = 'Sep';
+$labels['oct'] = 'Okt';
+$labels['nov'] = 'Nov';
+$labels['dec'] = 'Dec';
+$labels['longjan'] = 'Janvāris';
+$labels['longfeb'] = 'Februāris';
+$labels['longmar'] = 'Marts';
+$labels['longapr'] = 'Aprīlis';
+$labels['longmay'] = 'Maijs';
+$labels['longjun'] = 'Jūnijs';
+$labels['longjul'] = 'Jūlijs';
+$labels['longaug'] = 'Augusts';
+$labels['longsep'] = 'Septembris';
+$labels['longoct'] = 'Oktobris';
+$labels['longnov'] = 'Novembris';
+$labels['longdec'] = 'Decembris';
 $labels['today'] = 'Šodien';
 $labels['checkmail'] = 'Pārbaudīt pastu';
 $labels['writenewmessage'] = 'Rakstīt jaunu vēstuli';
@@ -91,10 +116,15 @@ $labels['viewsource'] = 'Rādīt pirmtekstu';
 $labels['markmessages'] = 'Atzīmēt vēstules';
 $labels['markread'] = 'Kā lasītas';
 $labels['markunread'] = 'Kā nelasītas';
+$labels['markflagged'] = 'Kā iezīmētas';
+$labels['markunflagged'] = 'Kā neiezīmētas';
 $labels['select'] = 'Iezīmēt';
 $labels['all'] = 'Visas';
 $labels['none'] = 'Nevienu';
 $labels['unread'] = 'Nelasītās';
+$labels['flagged'] = 'Iezīmētas';
+$labels['unanswered'] = 'Neatbildētas';
+$labels['filter'] = 'Filtrēt';
 $labels['compact'] = 'Saspiest';
 $labels['empty'] = 'Iztukšot';
 $labels['purge'] = 'Iztīrīt';
@@ -103,6 +133,7 @@ $labels['unknown'] = 'nezināms';
 $labels['unlimited'] = 'neierobežots';
 $labels['quicksearch'] = 'Ārtā meklēšana';
 $labels['resetsearch'] = 'Atstatīt meklēšanu';
+$labels['openinextwin'] = 'Atvērt jaunā logā';
 $labels['compose'] = 'Rakstīt vēstuli';
 $labels['savemessage'] = 'Saglabāt uzmetumu';
 $labels['sendmessage'] = 'Sūtīt vēstuli';
@@ -123,8 +154,12 @@ $labels['high'] = 'Augsta';
 $labels['highest'] = 'Augstākā';
 $labels['nosubject'] = '(no subject)';
 $labels['showimages'] = 'Rādīt attēlus';
+$labels['alwaysshow'] = 'Vienmēr rādīt attēlos no $sender';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Vienkāršs teksts';
+$labels['savesentmessagein'] = 'Saglabāt nosūtīto vēstuli mapē';
+$labels['dontsave'] = 'nesaglabāt';
+$labels['maxuploadsize'] = 'Maksimālais atļautais faila izmērs ir $size';
 $labels['addcc'] = 'Pievienot Cc';
 $labels['addbcc'] = 'Pievienot Bcc';
 $labels['addreplyto'] = 'Pievienot Reply-To';
@@ -148,12 +183,19 @@ $labels['composeto'] = 'Rakstīt vēstuli';
 $labels['contactsfromto'] = 'Ieraksti $from līdz $to no $count';
 $labels['print'] = 'Drukāt';
 $labels['export'] = 'Eksportēt';
+$labels['exportvcards'] = 'Eksportēt kontaktus vCard formātā';
 $labels['previouspage'] = 'Parādīt iepriekšējo kopu';
 $labels['firstpage'] = 'Parādīt pirmo kopu';
 $labels['nextpage'] = 'Parādīt nākamo kopu';
 $labels['lastpage'] = 'Parādīt pēdējo kopu';
 $labels['groups'] = 'Grupas';
 $labels['personaladrbook'] = 'Personīgās adreses';
+$labels['import'] = 'Importēt';
+$labels['importcontacts'] = 'Importēt kontaktus';
+$labels['importfromfile'] = 'Importēt no faila:';
+$labels['importreplace'] = 'Aizvietot visu adrešu grāmatu';
+$labels['importtext'] = 'Jūst varat augšupielādēt kontaktus no citas adrešu grāmatas.<br/>Pašlaik ir atbalstīts adrešu imports no <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> datu formāta.';
+$labels['done'] = 'Pabeigts';
 $labels['settingsfor'] = 'Iestatījumi';
 $labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'Lietotāja preferences';
@@ -164,6 +206,7 @@ $labels['newidentity'] = 'Jauna identitāte';
 $labels['newitem'] = 'Jauns';
 $labels['edititem'] = 'Rediģēt';
 $labels['setdefault'] = 'Uzlikt kā noklusēto';
+$labels['autodetect'] = 'Automātiski';
 $labels['language'] = 'Valoda';
 $labels['timezone'] = 'Laika zona';
 $labels['pagesize'] = 'Rindas lapā';
@@ -172,9 +215,35 @@ $labels['dstactive'] = 'Vasaras/ziemas laiks';
 $labels['htmleditor'] = 'Rakstīt HTML vēstules';
 $labels['htmlsignature'] = 'HTML paraksts';
 $labels['previewpane'] = 'Rādīt priekšskatījuma paneli';
+$labels['skin'] = 'Interfeisa izskats';
+$labels['logoutclear'] = 'Iztīrīt miskasti izejot';
+$labels['logoutcompact'] = 'Saspiest iesūtni izejot';
+$labels['uisettings'] = 'Lietotāja interfeiss';
+$labels['serversettings'] = 'Servera iestatījumi';
+$labels['askuser'] = 'jautāt lietotājam';
+$labels['autosend'] = 'sūtīt automātiski';
+$labels['ignore'] = 'ignorēt';
+$labels['readwhendeleted'] = 'Dzēšot atzīmēt vēstules kā izlasītas';
+$labels['flagfordeletion'] = 'Atzīmēt vēstules izdzēšanai, bet nedzēst';
+$labels['skipdeleted'] = 'Neattēlot dzēstās vēstules';
+$labels['showremoteimages'] = 'Attēlot attēlus, kas atrodas uz cita servera';
+$labels['fromknownsenders'] = 'no zināmiem sūtītājiem';
+$labels['always'] = 'vienmēr';
+$labels['showinlineimages'] = 'Attēlot pielikuma attēlus zem vēstules';
 $labels['autosavedraft'] = 'Automātiski saglabāt uzmetumu';
 $labels['everynminutes'] = 'katras $n minūtes';
+$labels['keepaliveevery'] = 'katru $n minūti(-es)';
+$labels['keepalive'] = 'Pārbaudīt jaunas vēstules mapēs';
 $labels['never'] = 'nekad';
+$labels['messagesdisplaying'] = 'Vēstuļu attēlošana';
+$labels['messagescomposition'] = 'Vēstuļu rakstīšana';
+$labels['mimeparamfolding'] = 'Pielikumu nosaukumi';
+$labels['2231folding'] = 'Pilns RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Pilns RFC 2047 (citi)';
+$labels['advancedoptions'] = 'Paplašināti iestatījumi';
+$labels['focusonnewmessage'] = 'Uztādīt pārluka fokusu uz jaunu vēstuli';
+$labels['checkallfolders'] = 'Pārbaudīt jaunās vēstulēs visās mapēs';
 $labels['folder'] = 'Mape';
 $labels['folders'] = 'Mapes';
 $labels['foldername'] = 'Mapes nosaukums';
@@ -186,8 +255,13 @@ $labels['rename'] = 'Pārsaukt';
 $labels['renamefolder'] = 'Pārsaukt mapi';
 $labels['deletefolder'] = 'Dzēst mapi';
 $labels['managefolders'] = 'Rediģēt mapes';
+$labels['specialfolders'] = 'Speciālās mapes';
 $labels['sortby'] = 'Kārtot pēc';
 $labels['sortasc'] = 'Kārtot augošā secībā';
 $labels['sortdesc'] = 'Kārtot dilstošā secībā';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index 5971586b7..0b0aafbd2 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -2,19 +2,20 @@
 
 /*
 
- +-----------------------------------------------------------------------+
- | language/lv/messages.inc                                              |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Rudolfs Osins <dev.random@gmail.com>                          |
- |         Mikelis Zalais <mik@prog.lv>                                  |
- +-----------------------------------------------------------------------+
++-----------------------------------------------------------------------+
+| language/lv/messages.inc                                              |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Rudolfs Osins <dev.random@gmail.com>                          |
+|         Mikelis Zalais <mik@prog.lv>                                  |
+|         Lauris Bukšis-Haberkorns <lauris@nix.lv>                      |
++-----------------------------------------------------------------------+
 
- @version $Id$
+@version $Id$
 
 */
 
@@ -41,6 +42,8 @@ $messages['encryptedmessage'] = 'Šī ir šifrēta vēstule un diemžēl nevar t
 $messages['nocontactsfound'] = 'Ieraksti netika atrasti';
 $messages['contactnotfound'] = 'Prasītais kontakts nav atrasts';
 $messages['sendingfailed'] = 'Vēstule netika nosūtīta';
+$messages['senttooquickly'] = 'Lūdzu uzgaidiet $sec sekundi(-es) pirms sūtiet šo vēstuli';
+$messages['errorsavingsent'] = 'Notika kļūda saglabājot nosūtīto vēstuli';
 $messages['errorsaving'] = 'Saglabājot vēstuli notikusi kļūme, vēstule netika saglabāta';
 $messages['errormoving'] = 'Vēstule netika pārvietota';
 $messages['errordeleting'] = 'Vēstule netika dzēsta';
@@ -48,10 +51,15 @@ $messages['deletecontactconfirm'] = 'Vai tiešām vēlaties dzēst iezīmēto(ā
 $messages['deletemessagesconfirm'] = 'Vai tiešām vēlaties dzēst iezīmēto(ās) vēstules?';
 $messages['deletefolderconfirm'] = 'Vai tiešām vēlaties dzēst šo mapi?';
 $messages['purgefolderconfirm'] = 'Vai tiešām vēlaties dzēst visas vēstules, kas atrodas šajā mapē?';
+$messages['foldercreating'] = 'Izveidoju mapi...';
+$messages['folderdeleting'] = 'Dzēšu mapi...';
+$messages['folderrenaming'] = 'Pārsaucu mapi...';
+$messages['foldermoving'] = 'Pārvietoju mapi...';
 $messages['formincomplete'] = 'Formulārs nav pilnībā aizpildīts';
 $messages['noemailwarning'] = 'Lūdzu ievadiet pareizu e-pasta adresi';
 $messages['nonamewarning'] = 'Lūdzu ievadiet vārdu';
 $messages['nopagesizewarning'] = 'Lūdzu ievadiet lapas izmēru';
+$messages['nosenderwarning'] = 'Lūdzu ievadiet saņēmēja e-pasta adresi';
 $messages['norecipientwarning'] = 'Lūdzu ievadiet vismaz vienu saņēmēju';
 $messages['nosubjectwarning'] = 'Lauks "temats" ir tukšs. Vai vēlaties to aizpildīt tagad?';
 $messages['nobodywarning'] = 'Sūtīt vēstuli bez satura teksta?';
@@ -79,5 +87,14 @@ $messages['receiptsent'] = 'Saņemšanas apstiprinājums nosūtīts';
 $messages['errorsendingreceipt'] = 'Neizdevās nosūtīt apstiprinājumu';
 $messages['nodeletelastidentity'] = 'Šo identitāti nevar izdzēst, tā ir pati pēdējā.';
 $messages['addsubfolderhint'] = 'Šis folderis tiks izveidots kā apakšfolderis tam, kurš patreiz ir izvēlēts';
+$messages['forbiddencharacter'] = 'Mapes nosaukums satur aizliegtus simbolus';
+$messages['selectimportfile'] = 'Lūdzu izvēlieties failu, ko vēlaties augšupielādēt';
+$messages['addresswriterror'] = 'Izvēlētās adrešu grāmatas datus nevar labot';
+$messages['importwait'] = 'Importēju, lūdzu uzgaidiet...';
+$messages['importerror'] = 'Imports neizdevās! Augšupielādētais fails nav korekts vCard fails';
+$messages['importconfirm'] = '<b>Veiksmīgi ieimportēti $inserted kontakti, netika importēti $skipped esoši ieraksti</b>:<p><em>$names</em></p>';
+$messages['opnotpermitted'] = 'Darbība nav atļauta!';
+$messages['nofromaddress'] = 'Izvēlētajai identitātei nav norādīta e-pasta adrese';
+$messages['editorwarning'] = 'Pārslēdzoties uz vienkāršotu teksta redaktoru, tiks pazaudēts esošais teksta formatējums. Vai vēlaties turpināt?';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 79cbd2233..24574c668 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -2,19 +2,20 @@
 
 /*
 
- +-----------------------------------------------------------------------+
- | language/nb_NO/labels.inc                                             |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
- | Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
- +-----------------------------------------------------------------------+
++-----------------------------------------------------------------------+
+| language/nb_NO/labels.inc                                             |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
+| Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
+| Author: Odd Henriksen <odd@digicon.no>                                |
++-----------------------------------------------------------------------+
 
- @version $Id$
+@version $Id$
 
 */
 
@@ -52,7 +53,7 @@ $labels['download'] = 'last ned';
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
 $labels['preferhtml'] = 'Foretrekk HTML';
-$labels['htmlmessage'] = 'HTML-beskjed';
+$labels['htmlmessage'] = 'HTML-melding';
 $labels['prettydate'] = 'Pen datovisning';
 $labels['addtoaddressbook'] = 'Tilføy til adresseboken';
 $labels['sun'] = 'Søn';
@@ -83,7 +84,7 @@ $labels['nov'] = 'Nov';
 $labels['dec'] = 'Des';
 $labels['longjan'] = 'Januar';
 $labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Marsj';
+$labels['longmar'] = 'Mars';
 $labels['longapr'] = 'April';
 $labels['longmay'] = 'Mai';
 $labels['longjun'] = 'Juni';
@@ -94,7 +95,7 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'Desember';
 $labels['today'] = 'I dag';
-$labels['checkmail'] = 'Sjekk for nye beskjeder';
+$labels['checkmail'] = 'Sjekk for nye meldinger';
 $labels['writenewmessage'] = 'Opprett en ny e-post';
 $labels['replytomessage'] = 'Svar på denne e-posten';
 $labels['replytoallmessage'] = 'Svar til alle mottakere';
@@ -112,13 +113,18 @@ $labels['lastmessage'] = 'Vis siste melding';
 $labels['lastmessages'] = 'Vis siste side med meldinger';
 $labels['backtolist'] = 'Tilbake til e-postlisten';
 $labels['viewsource'] = 'Vis kilde';
-$labels['markmessages'] = 'Merk e-postene';
+$labels['markmessages'] = 'Merk meldinger';
 $labels['markread'] = 'som lest';
 $labels['markunread'] = 'som ulest';
+$labels['markflagged'] = 'som flagget';
+$labels['markunflagged'] = 'som uflagget';
 $labels['select'] = 'Velg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
 $labels['unread'] = 'Uleste';
+$labels['flagged'] = 'Flagget';
+$labels['unanswered'] = 'Ubesvarte';
+$labels['filter'] = 'Filter';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
 $labels['purge'] = 'Tøm';
@@ -127,6 +133,7 @@ $labels['unknown'] = 'ukjent';
 $labels['unlimited'] = 'ubegrenset';
 $labels['quicksearch'] = 'Hurtigsøk';
 $labels['resetsearch'] = 'Nullstill søk';
+$labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['compose'] = 'Skriv ny e-post';
 $labels['savemessage'] = 'Lagre kladd';
 $labels['sendmessage'] = 'Send e-posten';
@@ -147,8 +154,12 @@ $labels['high'] = 'Høy';
 $labels['highest'] = 'Høyest';
 $labels['nosubject'] = '(intet emne)';
 $labels['showimages'] = 'Vis bilder';
+$labels['alwaysshow'] = 'Vis alltid bilder fra $sender';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Ren tekst';
+$labels['savesentmessagein'] = 'Lagre sendt melding i';
+$labels['dontsave'] = 'ikke lagre';
+$labels['maxuploadsize'] = 'Maksimalt tillatt filstørrelse er $size';
 $labels['addcc'] = 'Legg til Cc';
 $labels['addbcc'] = 'Legg til Bcc';
 $labels['addreplyto'] = 'Legg til Reply-To';
@@ -171,13 +182,20 @@ $labels['deletecontact'] = 'Slett valgte kontakter';
 $labels['composeto'] = 'Skriv e-post til';
 $labels['contactsfromto'] = 'Kontakter $from til $to av $count';
 $labels['print'] = 'Skriv ut';
-$labels['export'] = 'Eksportere';
+$labels['export'] = 'Eksporter';
+$labels['exportvcards'] = 'Eksporter kontakter i vCard-format';
 $labels['previouspage'] = 'Vis forrige sett';
 $labels['firstpage'] = 'Vis første sett';
 $labels['nextpage'] = 'Vis neste sett';
 $labels['lastpage'] = 'Vis siste sett';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Egne adresser';
+$labels['import'] = 'Importer';
+$labels['importcontacts'] = 'Importer kontakter';
+$labels['importfromfile'] = 'Importer fra fil:';
+$labels['importreplace'] = 'Erstatt hele adresseboken';
+$labels['importtext'] = 'Du kan laste opp kontakter fra en eksisterende adressebok.<br/>For øyeblikket støttes importering av kontakter i <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>-formatet.';
+$labels['done'] = 'Fullført';
 $labels['settingsfor'] = 'Innstillinger for';
 $labels['preferences'] = 'Oppsett';
 $labels['userpreferences'] = 'Brukeroppsett';
@@ -188,6 +206,7 @@ $labels['newidentity'] = 'Ny identitet';
 $labels['newitem'] = 'Nytt punkt';
 $labels['edititem'] = 'Rediger punkt';
 $labels['setdefault'] = 'Sett som standard';
+$labels['autodetect'] = 'Auto';
 $labels['language'] = 'Språk';
 $labels['timezone'] = 'Tidssone';
 $labels['pagesize'] = 'Linjer per side';
@@ -196,13 +215,37 @@ $labels['dstactive'] = 'Sommertid';
 $labels['htmleditor'] = 'Bruk HTML-editor';
 $labels['htmlsignature'] = 'HTML-signatur';
 $labels['previewpane'] = 'Forhåndsvisning';
-$labels['logoutclear'] = 'Tøm søpel ved utlogging';
+$labels['skin'] = 'Utseende';
+$labels['logoutclear'] = 'Tøm søppel ved utlogging';
 $labels['logoutcompact'] = 'Kompakt innboksen ved utlogging';
 $labels['uisettings'] = 'Brukergrensesnitt';
 $labels['serversettings'] = 'Serverinnstillinger';
+$labels['mailboxview'] = 'E-postvisning';
+$labels['mdnrequests'] = 'Tilbakemelding til avsender';
+$labels['askuser'] = 'spør hver gang';
+$labels['autosend'] = 'send automatisk';
+$labels['ignore'] = 'ignorer';
+$labels['readwhendeleted'] = 'Merk melding som lest ved sletting';
+$labels['flagfordeletion'] = 'Flagg meldingen for sletting i stedet for å slette';
+$labels['skipdeleted'] = 'Ikke vis slettede meldinger';
+$labels['showremoteimages'] = 'Vis eksterne bilder i meldinger';
+$labels['fromknownsenders'] = 'fra kjente avsendere';
+$labels['always'] = 'alltid';
+$labels['showinlineimages'] = 'Vis vedlagte bilder under meldingen';
 $labels['autosavedraft'] = 'Autolagring av utkast';
 $labels['everynminutes'] = 'Hvert $n. minutt';
+$labels['keepaliveevery'] = 'hvert $n minutt';
+$labels['keepalive'] = 'Se etter ny e-post';
 $labels['never'] = 'Aldri';
+$labels['messagesdisplaying'] = 'Visning av meldinger';
+$labels['messagescomposition'] = 'Skriving av meldinger';
+$labels['mimeparamfolding'] = 'Vedleggsnavn';
+$labels['2231folding'] = 'Fullstendig RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Fullstendig RFC 2047 (andre)';
+$labels['advancedoptions'] = 'Avanserte alternativer';
+$labels['focusonnewmessage'] = 'Gi nettleservindu fokus ved nye meldinger';
+$labels['checkallfolders'] = 'Kontroller alle mapper for nye meldinger';
 $labels['folder'] = 'Mappe';
 $labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenavn';
@@ -214,8 +257,13 @@ $labels['rename'] = 'Endre navn';
 $labels['renamefolder'] = 'Endre navn på mappe';
 $labels['deletefolder'] = 'Slett mappe';
 $labels['managefolders'] = 'Rediger mapper';
+$labels['specialfolders'] = 'Spesielle mapper';
 $labels['sortby'] = 'Sorter etter';
 $labels['sortasc'] = 'Eldste først';
 $labels['sortdesc'] = 'Nyeste først';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index a8f3d7191..b3ef82edb 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -2,19 +2,20 @@
 
 /*
 
- +-----------------------------------------------------------------------+
- | language/nb_NO/messages.inc                                           |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
- | Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
- +-----------------------------------------------------------------------+
++-----------------------------------------------------------------------+
+| language/nb_NO/messages.inc                                           |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Kjetil Waage - Nextline AS <kjetil@nextline.no>               |
+| Author: Tor Erik Linnerud - JKLM <tel@jklm.no>                        |
+| Author: Odd Henriksen <odd@digicon.no>                                |
++-----------------------------------------------------------------------+
 
- @version $Id$
+@version $Id$
 
 */
 
@@ -23,35 +24,42 @@ $messages['loginfailed'] = 'Pålogging mislyktes';
 $messages['cookiesdisabled'] = 'Din nettleser aksepterer ikke cookies';
 $messages['sessionerror'] = 'Din session er ugyldig eller utløpt';
 $messages['imaperror'] = 'Forbindelsen til IMAP serveren sviktet';
-$messages['nomessagesfound'] = 'Det ble ikke funnet noen beskjeder i denne innboksen';
+$messages['nomessagesfound'] = 'Det ble ikke funnet noen meldinger i denne innboksen';
 $messages['loggedout'] = 'Du er logget av webmail. Ha det bra!';
 $messages['mailboxempty'] = 'Postkassen er tom!';
 $messages['loading'] = 'Laster...';
 $messages['loadingdata'] = 'Laster data...';
-$messages['checkingmail'] = 'Sjekker for nye beskjeder...';
-$messages['sendingmessage'] = 'Sender beskjed...';
-$messages['messagesent'] = 'Beskjeden ble sendt uten feil';
-$messages['savingmessage'] = 'Lagrer beskjed...';
-$messages['messagesaved'] = 'Beskjed er lagret i "kladder" mappen';
+$messages['checkingmail'] = 'Sjekker for nye meldinger...';
+$messages['sendingmessage'] = 'Sender melding...';
+$messages['messagesent'] = 'Meldingen ble sendt uten feil';
+$messages['savingmessage'] = 'Lagrer melding...';
+$messages['messagesaved'] = 'Melding er lagret som utkast';
 $messages['successfullysaved'] = 'Lagret';
 $messages['addedsuccessfully'] = 'Kontakten ble tilføyd i adresseboken';
 $messages['contactexists'] = 'Der er allerede en kontakt med denne e-postadressen';
-$messages['blockedimages'] = 'Bilder fra eksterne servere er blokkert i denne e-posten.';
-$messages['encryptedmessage'] = 'Dette er en krypteret beskjed og kan ikke vises. Beklager!';
+$messages['blockedimages'] = 'Eksterne bilder er blitt blokkert i denne e-postmeldingen.';
+$messages['encryptedmessage'] = 'Dette er en kryptert melding og kan ikke vises. Beklager!';
 $messages['nocontactsfound'] = 'Ingen kontakter ble funnet';
 $messages['contactnotfound'] = 'Den forespurte kontakten ble ikke funnet';
 $messages['sendingfailed'] = 'Kunne ikke sende e-posten';
+$messages['senttooquickly'] = 'Vennligst vent $sec sekund(er) før du sender denne meldingen';
+$messages['errorsavingsent'] = 'En feil oppsto under lagring av sendt melding';
 $messages['errorsaving'] = 'Det oppstod en feil ved lagring av data';
-$messages['errormoving'] = 'Kunne ikke flytte beskjeden';
-$messages['errordeleting'] = 'Kunne ikke slette beskjeden';
+$messages['errormoving'] = 'Kunne ikke flytte meldingen';
+$messages['errordeleting'] = 'Kunne ikke slette meldingen';
 $messages['deletecontactconfirm'] = 'Vil du virkelig slette valgte kontakt(er)?';
-$messages['deletemessagesconfirm'] = 'Vil du virkelig slette de valgte meldingen(e)?';
+$messages['deletemessagesconfirm'] = 'Vil du virkelig slette de(n) valgte meldingen(e)?';
 $messages['deletefolderconfirm'] = 'Vil du virkelig slette denne mappen?';
 $messages['purgefolderconfirm'] = 'Vil du virkelig slette alle meldingene i denne mappen?';
+$messages['foldercreating'] = 'Oppretter mappe...';
+$messages['folderdeleting'] = 'Sletter mappe...';
+$messages['folderrenaming'] = 'Gir nytt navn til mappe...';
+$messages['foldermoving'] = 'Flytter mappe...';
 $messages['formincomplete'] = 'Skjemaet var ikke fullstendig fylt ut';
 $messages['noemailwarning'] = 'Skriv inn en gyldig e-post adresse';
 $messages['nonamewarning'] = 'Angi et navn';
 $messages['nopagesizewarning'] = 'Angi sidestørrelsen';
+$messages['nosenderwarning'] = 'Vennligst angi avsenderadresse';
 $messages['norecipientwarning'] = 'Skriv inn minst en mottaker';
 $messages['nosubjectwarning'] = '"Emne" feltet er tomt. Vil du skrive det inn nå?';
 $messages['nobodywarning'] = 'Send denne e-post uten tekst?';
@@ -79,5 +87,14 @@ $messages['receiptsent'] = 'Kvittering har blitt sent';
 $messages['errorsendingreceipt'] = 'Kunne ikke sende kvittering';
 $messages['nodeletelastidentity'] = 'Du kan ikke slette denne identiteten, det er din siste.';
 $messages['addsubfolderhint'] = 'Mappen vil bli opprettet som en undermappe av den nåværende valgte mappe';
+$messages['forbiddencharacter'] = 'Mappenavnet inneholder et tegn som ikke er tillatt';
+$messages['selectimportfile'] = 'Vennligst velg en fil for opplasting';
+$messages['addresswriterror'] = 'Den valgte adresseboken er ikke skrivbar';
+$messages['importwait'] = 'Importerer, vennligst vent...';
+$messages['importerror'] = 'Importering feilet! Den opplastede filen er ikke en gyldig vCard-fil.';
+$messages['importconfirm'] = '<b>Importerte $inserted kontakter vellykket, hoppet over $skipped eksisterende oppføringer</b>: <p><em>$names</em></p>';
+$messages['opnotpermitted'] = 'Handling ikke tillatt!';
+$messages['nofromaddress'] = 'E-postadresse mangler i valgt identitet';
+$messages['editorwarning'] = 'Å bytte format til ren tekst vil føre til at all tekstformatering går tapt. Ønsker du å fortsette?';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 41c6c14dd..dbba51260 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -121,7 +121,7 @@ $labels['select'] = 'Selecteren';
 $labels['all'] = 'Alles';
 $labels['none'] = 'Geen';
 $labels['unread'] = 'Ongelezen';
-$labels['flagged'] = 'Gemarkeerd';
+$labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
 $labels['filter'] = 'Filter';
 $labels['compact'] = 'Comprimeren';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index e40a2c9fc..38fc9f7f2 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -122,7 +122,7 @@ $labels['select'] = 'Selecteer';
 $labels['all'] = 'Allemaal';
 $labels['none'] = 'Geen';
 $labels['unread'] = 'Ongelezen';
-$labels['flagged'] = 'Gemarkeerd';
+$labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
 $labels['filter'] = 'Filter';
 $labels['compact'] = 'Opschonen';
@@ -133,6 +133,8 @@ $labels['unknown'] = 'onbekend';
 $labels['unlimited'] = 'onbeperkt';
 $labels['quicksearch'] = 'Snel zoeken';
 $labels['resetsearch'] = 'Reset zoekopdracht';
+$labels['searchmod'] = 'Zoekopties';
+$labels['msgtext'] = 'Gehele bericht';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['compose'] = 'Nieuw bericht aanmaken';
 $labels['savemessage'] = 'Bewaar als concept';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index dba23a8e0..7b8a39d64 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -142,6 +142,8 @@ $labels['unknown'] = 'nieznane';
 $labels['unlimited'] = 'bez limitu';
 $labels['quicksearch'] = 'Szybkie wyszukiwanie';
 $labels['resetsearch'] = 'Wyczyść filtr';
+$labels['searchmod']  = 'Parametry wyszukiwania';
+$labels['msgtext']  = 'Cała wiadomość';
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['compose'] = 'Utwórz wiadomość';
 $labels['savemessage'] = 'Zapisz kopię roboczą';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 884e06605..f4ab081f6 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -41,7 +41,7 @@ $labels['from'] = 'Remetente';
 $labels['to'] = 'Para';
 $labels['cc'] = 'Cópia';
 $labels['bcc'] = 'Cópia Oculta (Bcc)';
-$labels['replyto'] = 'Responder para';
+$labels['replyto'] = 'Resp. para';
 $labels['date'] = 'Data';
 $labels['size'] = 'Tamanho';
 $labels['priority'] = 'Prioridade';
@@ -135,6 +135,8 @@ $labels['unknown'] = 'desconhecido';
 $labels['unlimited'] = 'ilimitado';
 $labels['quicksearch'] = 'Pesquisa rápida';
 $labels['resetsearch'] = 'Limpar';
+$labels['searchmod'] = 'Opções da pesquisa';
+$labels['msgtext'] = 'Mensagem inteira';
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['compose'] = 'Escrever mensagem';
 $labels['savemessage'] = 'Salvar Rascunho';
@@ -164,7 +166,7 @@ $labels['dontsave'] = 'não salvar';
 $labels['maxuploadsize'] = 'Tamanho máximo permitido do arquivo é $size';
 $labels['addcc'] = 'Cópia';
 $labels['addbcc'] = 'Cópia Oculta';
-$labels['addreplyto'] = 'Responder para';
+$labels['addreplyto'] = 'Resp. para';
 $labels['mdnrequest'] = 'O remetente desta mensagem deseja ser notificado quando você ler esta mensagem. Você permite o envio desta notificação?';
 $labels['receiptread'] = 'Confirmação de Leitura (Exibida)';
 $labels['yourmessage'] = 'Esta é uma confirmação de leitura da sua mensagem';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index def0d5716..6ba822439 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -40,7 +40,7 @@ $labels['from'] = 'Remetente';
 $labels['to'] = 'Para';
 $labels['cc'] = 'Cópia';
 $labels['bcc'] = 'Bcc';
-$labels['replyto'] = 'Responder para';
+$labels['replyto'] = 'Resp. para';
 $labels['date'] = 'Data';
 $labels['size'] = 'Tamanho';
 $labels['priority'] = 'Prioridade';
@@ -163,7 +163,7 @@ $labels['dontsave'] = 'não salvar';
 $labels['maxuploadsize'] = 'Tamanho máximo permitido do ficheiro é $size';
 $labels['addcc'] = 'Adicionar Cc';
 $labels['addbcc'] = 'Adicionar Bcc';
-$labels['addreplyto'] = 'Adicionar "Responder para"';
+$labels['addreplyto'] = 'Adicionar Resp. para';
 $labels['mdnrequest'] = 'O remetente desta mensagem pediu para ser notificado quando esta fosse lida. Deseja enviar uma notificação?';
 $labels['receiptread'] = 'Recibo de leitura';
 $labels['yourmessage'] = 'Isto é um recibo de leitura da sua mensagem';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 0c42ce144..239b5bac0 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -1,20 +1,19 @@
 <?php
 
 /*
++-----------------------------------------------------------------------+
+| language/ro_RO/labels.inc                                             |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Daniel Anechitoaie - danieLs <daniels@safereaction.ro>        |
+|         Zeno Popovici <zeno.popovici at ulbsibiu.ro>                  |
++-----------------------------------------------------------------------+
 
- +-----------------------------------------------------------------------+
- | language/ro/labels.inc                                                |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Daniel Anechitoaie - danieLs <daniels@safereaction.ro>        |
- |         Ispas Dorin <dorinxp2004@yahoo.com>                           |
- +-----------------------------------------------------------------------+
-
- @version $Id$
+@version $Id$
 
 */
 
@@ -32,7 +31,7 @@ $labels['inbox'] = 'Primite';
 $labels['drafts'] = 'Ciorne';
 $labels['sent'] = 'Trimise';
 $labels['trash'] = 'Gunoi';
-$labels['junk'] = 'Junk';
+$labels['junk'] = 'Spam';
 $labels['subject'] = 'Subiect';
 $labels['from'] = 'Expeditor';
 $labels['to'] = 'Destinatar';
@@ -69,6 +68,30 @@ $labels['wednesday'] = 'Miercuri';
 $labels['thursday'] = 'Joi';
 $labels['friday'] = 'Vineri';
 $labels['saturday'] = 'Sambata';
+$labels['jan'] = 'Ian';
+$labels['feb'] = 'Feb';
+$labels['mar'] = 'Mar';
+$labels['apr'] = 'Apr';
+$labels['may'] = 'Mai';
+$labels['jun'] = 'Iun';
+$labels['jul'] = 'Iul';
+$labels['aug'] = 'Aug';
+$labels['sep'] = 'Sep';
+$labels['oct'] = 'Oct';
+$labels['nov'] = 'Noi';
+$labels['dec'] = 'Dec';
+$labels['longjan'] = 'Ianuarie';
+$labels['longfeb'] = 'Februarie';
+$labels['longmar'] = 'Martie';
+$labels['longapr'] = 'Aprilie';
+$labels['longmay'] = 'Mai';
+$labels['longjun'] = 'Iunie';
+$labels['longjul'] = 'Iulie';
+$labels['longaug'] = 'August';
+$labels['longsep'] = 'Septembrie';
+$labels['longoct'] = 'Octombrie';
+$labels['longnov'] = 'Noiembrie';
+$labels['longdec'] = 'Decembrie';
 $labels['today'] = 'Astazi';
 $labels['checkmail'] = 'Verifica pentru mesaje noi';
 $labels['writenewmessage'] = 'Creaza mesaj nou';
@@ -91,10 +114,15 @@ $labels['viewsource'] = 'Afiseaza sursa';
 $labels['markmessages'] = 'Marcheaza mesajele';
 $labels['markread'] = 'Ca citit';
 $labels['markunread'] = 'Ca necitit';
+$labels['markflagged'] = 'Ca marcat';
+$labels['markunflagged'] = 'Ca nemarcat';
 $labels['select'] = 'Selecteaza';
 $labels['all'] = 'Toate';
 $labels['none'] = 'Nici unul';
 $labels['unread'] = 'Necitite';
+$labels['flagged'] = 'Marcat';
+$labels['unanswered'] = 'Neraspuns';
+$labels['filter'] = 'Filtru';
 $labels['compact'] = 'Compreseaza';
 $labels['empty'] = 'Goleste';
 $labels['purge'] = 'Curata';
@@ -103,6 +131,7 @@ $labels['unknown'] = 'necunoscut';
 $labels['unlimited'] = 'nelimitat';
 $labels['quicksearch'] = 'Cautare rapida';
 $labels['resetsearch'] = 'Resetare cautare';
+$labels['openinextwin'] = 'Deschide in fereastra noua';
 $labels['compose'] = 'Compune mesaj';
 $labels['savemessage'] = 'Salveaza aceasta ciorna';
 $labels['sendmessage'] = 'Trimite mesaj';
@@ -123,8 +152,12 @@ $labels['high'] = 'Mare';
 $labels['highest'] = 'Cea mai mare';
 $labels['nosubject'] = '(fara subiect)';
 $labels['showimages'] = 'Afiseaza imagini';
+$labels['alwaysshow'] = 'Afiseaza intotdeauna imaginile de la $sender';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text simplu';
+$labels['savesentmessagein'] = 'Salveaza mesajele in';
+$labels['dontsave'] = 'Nu salva';
+$labels['maxuploadsize'] = 'Marimea maxima admisa a fisierului este $size';
 $labels['addcc'] = 'Adauga Cc';
 $labels['addbcc'] = 'Adauga Bcc';
 $labels['addreplyto'] = 'Adauga Raspunde-La';
@@ -148,12 +181,19 @@ $labels['composeto'] = 'Compune e-mail pentru';
 $labels['contactsfromto'] = 'Contacte de la $from pana la $to din $count';
 $labels['print'] = 'Listeaza';
 $labels['export'] = 'Exporta';
+$labels['exportvcards'] = 'Exporta contactele in format vCard';
 $labels['previouspage'] = 'Pagina anterioara';
 $labels['firstpage'] = 'Arata primul set';
 $labels['nextpage'] = 'Pagina urmatoare';
 $labels['lastpage'] = 'Arata ultimul set';
 $labels['groups'] = 'Grupuri';
 $labels['personaladrbook'] = 'Adrese personale';
+$labels['import'] = 'Importa';
+$labels['importcontacts'] = 'Importa contacte';
+$labels['importfromfile'] = 'Importa din fisier:';
+$labels['importreplace'] = 'Inlocuieste intreaga agenda';
+$labels['importtext'] = 'Puteti incarca contacte dintr-o agenda existenta.<br/>Se pot importa adresele in format <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
+$labels['done'] = 'Finalizat';
 $labels['settingsfor'] = 'Setari pentru';
 $labels['preferences'] = 'Preferinte';
 $labels['userpreferences'] = 'Preferinte utilizator';
@@ -164,6 +204,7 @@ $labels['newidentity'] = 'Identitate noua';
 $labels['newitem'] = 'Item nou';
 $labels['edititem'] = 'Editeaza item';
 $labels['setdefault'] = 'Seteaza implicit';
+$labels['autodetect'] = 'Automat';
 $labels['language'] = 'Limba';
 $labels['timezone'] = 'Fus orar';
 $labels['pagesize'] = 'Randuri pe pagina';
@@ -172,9 +213,37 @@ $labels['dstactive'] = 'Daylight savings';
 $labels['htmleditor'] = 'Scrie mesaje HTML';
 $labels['htmlsignature'] = 'Semnatura HTML';
 $labels['previewpane'] = 'Arata preview';
+$labels['skin'] = 'Tema interfata';
+$labels['logoutclear'] = 'Goleste dosarul Gunoi la logout';
+$labels['logoutcompact'] = 'Compacteaza dosarul Primite la logout';
+$labels['uisettings'] = 'Interfata utilizator';
+$labels['serversettings'] = 'Configuratii server';
+$labels['mailboxview'] = 'Afisare Mailbox';
+$labels['mdnrequests'] = 'Notificari expeditor';
+$labels['askuser'] = 'intreaba utilizatorul';
+$labels['autosend'] = 'trimite automat';
+$labels['ignore'] = 'ignora';
+$labels['readwhendeleted'] = 'Marcheaza mesajul ca si citit la stergere';
+$labels['flagfordeletion'] = 'Marcheaza mesajele pentru stergere in loc de a-l sterge direct';
+$labels['skipdeleted'] = 'Nu arata mesajele sterse';
+$labels['showremoteimages'] = 'Arata imagini remote';
+$labels['fromknownsenders'] = 'de la expeditori cunoscuti';
+$labels['always'] = 'intotdeauna';
+$labels['showinlineimages'] = 'Arata imaginile atasate sub mesaj';
 $labels['autosavedraft'] = 'Salveaza ciorna automat';
 $labels['everynminutes'] = 'fiecare $n minute';
+$labels['keepaliveevery'] = 'fiecare $n minut(e)';
+$labels['keepalive'] = 'Verifica mesaje noi la';
 $labels['never'] = 'niciodata';
+$labels['messagesdisplaying'] = 'Afisarea Mesajelor';
+$labels['messagescomposition'] = 'Compunerea Mesajelor';
+$labels['mimeparamfolding'] = 'Nume Atasamente';
+$labels['2231folding'] = 'RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'RFC 2047 (Altele)';
+$labels['advancedoptions'] = 'Optiuni Avansate';
+$labels['focusonnewmessage'] = 'Focus pe fereastra browser-ului la mesaje noi';
+$labels['checkallfolders'] = 'Verifica toate dosarele pentru mesaje noi';
 $labels['folder'] = 'Dosar';
 $labels['folders'] = 'Dosare';
 $labels['foldername'] = 'Nume dosar';
@@ -186,8 +255,14 @@ $labels['rename'] = 'Redenumeste';
 $labels['renamefolder'] = 'Redenumeste dosar';
 $labels['deletefolder'] = 'Sterge dosar';
 $labels['managefolders'] = 'Administreaza dosare';
+$labels['specialfolders'] = 'Dosare speciale';
 $labels['sortby'] = 'Sorteaza dupa';
 $labels['sortasc'] = 'Sorteaza ascendent';
 $labels['sortdesc'] = 'Sorteaza descendent';
+$labels['B'] = 'O';
+$labels['KB'] = 'KO';
+$labels['MB'] = 'MO';
+$labels['GB'] = 'GO';
+
+?>
 
-?>
\ No newline at end of file
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 1ce074a8d..5d3dec34f 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -1,20 +1,19 @@
 <?php
 
 /*
++-----------------------------------------------------------------------+
+| language/ro_RO/messages.inc                                           |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Daniel Anechitoaie - danieLs <daniels@safereaction.ro>        |
+|         Zeno Popovici <zeno.popovici at ulbsibiu.ro>                  |
++-----------------------------------------------------------------------+
 
- +-----------------------------------------------------------------------+
- | language/ro/messages.inc                                              |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Daniel Anechitoaie - danieLs <daniels@safereaction.ro>        |
- |         Ispas Dorin <dorinxp2004@yahoo.com>                           |
- +-----------------------------------------------------------------------+
-
- @version $Id$
+@version $Id$
 
 */
 
@@ -41,6 +40,8 @@ $messages['encryptedmessage'] = 'Acesta este un mesaj criptat si nu poate fi afi
 $messages['nocontactsfound'] = 'Nu s-a gasit nici un contact';
 $messages['contactnotfound'] = 'Contactul solicitat nu a fost gasit.';
 $messages['sendingfailed'] = 'Nu s-a reusit trimiterea mesajului';
+$messages['senttooquickly'] = 'Va rugam asteptati $sec sec. inainte de a trimite acest mesaj';
+$messages['errorsavingsent'] = 'A intervenit o eroare in timp ce se efectua salvarea mesajului trimis';
 $messages['errorsaving'] = 'A intervenit o eroare in timp ce se efectua salvarea';
 $messages['errormoving'] = 'Nu s-a putut muta mesajul';
 $messages['errordeleting'] = 'Nu s-a putut sterge mesajul';
@@ -48,10 +49,15 @@ $messages['deletecontactconfirm'] = 'Sunteti sigur ca doriti sa stergeti contact
 $messages['deletemessagesconfirm'] = 'Chiar doriti sa stergeti mesajele selectate ?';
 $messages['deletefolderconfirm'] = 'Sunteti sigur ca doriti sa stergeti acest dosar?';
 $messages['purgefolderconfirm'] = 'Sunteti sigur ca doriti sa stergeti toate mesajele din acest dosar?';
+$messages['foldercreating'] = 'Se creaza dosarul...';
+$messages['folderdeleting'] = 'Se sterge dosarul...';
+$messages['folderrenaming'] = 'Se redenumeste dosarul...';
+$messages['foldermoving'] = 'Se muta dosarul...';
 $messages['formincomplete'] = 'Formularul nu a fost completat corect';
 $messages['noemailwarning'] = 'Va rugam introduceti o adresa de e-mail valida';
 $messages['nonamewarning'] = 'Va rugam introduceti un nume';
 $messages['nopagesizewarning'] = 'Va rugam introduceti marimea paginii';
+$messages['nosenderwarning'] = 'Va rugam introduceti adresa expeditorului';
 $messages['norecipientwarning'] = 'Va rugam introduceti cel putin un destinatar';
 $messages['nosubjectwarning'] = 'Mesajul nu are subiect. Vreti sa introduceti unul acum?';
 $messages['nobodywarning'] = 'Trimiteti acest mesaj fara text?';
@@ -79,5 +85,15 @@ $messages['receiptsent'] = 'Confirmarea a fost trimisa cu succes';
 $messages['errorsendingreceipt'] = 'Confirmarea nu a putut fi trimisa';
 $messages['nodeletelastidentity'] = 'Nu putesti sterge aceasta identitate, este ultima.';
 $messages['addsubfolderhint'] = 'Acest dosar va fi creat ca subdosar al celui selectat.';
+$messages['forbiddencharacter'] = 'Numele dosarului contine un caracter nepermis.';
+$messages['selectimportfile'] = 'Va rugam selectati fisierul pentru incarcare';
+$messages['addresswriterror'] = 'Agenda selectata nu poate fi actualizata';
+$messages['importwait'] = 'Se importeaza, va rugam asteptati...';
+$messages['importerror'] = 'Importarea a esuat! Fisierul incarcat nu este un fisier vCard valid.';
+$messages['importconfirm'] = '<b>Contactele $inserted au fost importate cu succes, $skipped intrari au fost ignorate deoarece ele exista deja</b>:<p><em>$names</em></p>';
+$messages['opnotpermitted'] = 'Operatia nu este permisa!';
+$messages['nofromaddress'] = 'Nu exista o adresa de e-mail in identitatea selectata';
+$messages['editorwarning'] = 'Trecerea in mod text a editorului va cauza pierderea formatarii textului. Doriti sa continuati?';
+
+?>
 
-?>
\ No newline at end of file
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 86ab10923..ef5568a95 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -12,7 +12,7 @@
 +-----------------------------------------------------------------------+
 | Author: Maxim Zenin <maxx@webmechanics.ru>                            |
 |         Vladimir Kulev <me@lightoze.net>                              |
-|         Artur Smolkin <admin@roundcube.ru>                            |
+|         Artur Smolkin <artsmolkin@ya.ru>                              |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -133,6 +133,8 @@ $labels['unknown'] = 'неизвестно';
 $labels['unlimited'] = 'без ограничений';
 $labels['quicksearch'] = 'Быстрый поиск';
 $labels['resetsearch'] = 'Сброс';
+$labels['searchmod'] = 'Варианты поиска';
+$labels['msgtext'] = 'Всё сообщение';
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['compose'] = 'Написать сообщение';
 $labels['savemessage'] = 'Сохранить черновик';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 714d25384..0146571bf 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -2,46 +2,38 @@
 
 /*
 
- +-----------------------------------------------------------------------+
- | language/sv_SE/labels.inc                                             |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Fredrik Nygren <f.nygren@gmail.com>                           |
- |         Andreas Henriksson <andreas@fatal.se>                         |
- |         Jonas Nasholm <info@bitfuse.net>                              |
- +-----------------------------------------------------------------------+
-
- @version $Id$
++-----------------------------------------------------------------------+
+| language/sv_SE/labels.inc                                             |
+|                                                                       |
+| Language file of the RoundCube Webmail client                         |
+| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+| Licensed under the GNU GPL                                            |
+|                                                                       |
++-----------------------------------------------------------------------+
+| Author: Jonas Nasholm <info@bitfuse.net>                              |
+|         Fredrik Nygren <f.nygren@gmail.com>                           |
+|         Andreas Henriksson <andreas@fatal.se>                         |
++-----------------------------------------------------------------------+
+
+@version $Id$
 
 */
 
 $labels = array();
-
-// login page
 $labels['welcome'] = 'Välkommen till $product';
 $labels['username'] = 'Användarnamn';
 $labels['password'] = 'Lösenord';
 $labels['server'] = 'Server';
 $labels['login'] = 'Logga in';
-
-// taskbar
 $labels['logout'] = 'Logga ut';
 $labels['mail'] = 'Meddelanden';
 $labels['settings'] = 'Personliga inställningar';
 $labels['addressbook'] = 'Adressbok';
-
-// mailbox names
 $labels['inbox'] = 'Inkorg';
 $labels['drafts'] = 'Utkast';
 $labels['sent'] = 'Skickat';
 $labels['trash'] = 'Papperskorg';
 $labels['junk'] = 'Skräp';
-
-// message listing
 $labels['subject'] = 'Ämne';
 $labels['from'] = 'Avsändare';
 $labels['to'] = 'Mottagare';
@@ -52,27 +44,18 @@ $labels['date'] = 'Datum';
 $labels['size'] = 'Storlek';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
-
-// aliases
 $labels['reply-to'] = 'Svara till';
-
 $labels['mailboxlist'] = 'Kataloger';
 $labels['messagesfromto'] = 'Meddelande $from till $to av $count';
 $labels['messagenrof'] = 'Meddelande $nr av $count';
-
 $labels['moveto'] = 'Flytta till:';
 $labels['download'] = 'Ladda ner';
-
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorlek';
-
 $labels['preferhtml'] = 'Visa meddelanden i HTML-format';
 $labels['htmlmessage'] = 'HTML-meddelande';
 $labels['prettydate'] = 'Fina datum';
-
 $labels['addtoaddressbook'] = 'Lägg till i adressbok';
-
-// weekdays short
 $labels['sun'] = 'Sön';
 $labels['mon'] = 'Mån';
 $labels['tue'] = 'Tis';
@@ -80,8 +63,6 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lör';
-
-// weekdays long
 $labels['sunday'] = 'Söndag';
 $labels['monday'] = 'Måndag';
 $labels['tuesday'] = 'Tisdag';
@@ -89,37 +70,31 @@ $labels['wednesday'] = 'Onsdag';
 $labels['thursday'] = 'Torsdag';
 $labels['friday'] = 'Fredag';
 $labels['saturday'] = 'Lördag';
-
-// months short
-$labels['jan']	= 'Jan';
-$labels['feb']	= 'Feb';
-$labels['mar']	= 'Mar';
-$labels['apr']	= 'Apr';
-$labels['may']	= 'Maj';
-$labels['jun']	= 'Jun';
-$labels['jul'] 	= 'Jul';
-$labels['aug']	= 'Aug';
-$labels['sep']	= 'Sep';
-$labels['oct']	= 'Okt';
-$labels['nov']	= 'Nov';
-$labels['dec']	= 'Dec';
-
-// months long
-$labels['longjan']	= 'Januari';
-$labels['longfeb']	= 'Februari';
-$labels['longmar']	= 'Mars';
-$labels['longapr']	= 'April';
-$labels['longmay']	= 'Maj';
-$labels['longjun']	= 'Juni';
-$labels['longjul']	= 'Juli';
-$labels['longaug']	= 'Augusti';
-$labels['longsep']	= 'September';
-$labels['longoct']	= 'Oktober';
-$labels['longnov']	= 'November';
-$labels['longdec']	= 'December';
+$labels['jan'] = 'Jan';
+$labels['feb'] = 'Feb';
+$labels['mar'] = 'Mar';
+$labels['apr'] = 'Apr';
+$labels['may'] = 'Maj';
+$labels['jun'] = 'Jun';
+$labels['jul'] = 'Jul';
+$labels['aug'] = 'Aug';
+$labels['sep'] = 'Sep';
+$labels['oct'] = 'Okt';
+$labels['nov'] = 'Nov';
+$labels['dec'] = 'Dec';
+$labels['longjan'] = 'Januari';
+$labels['longfeb'] = 'Februari';
+$labels['longmar'] = 'Mars';
+$labels['longapr'] = 'April';
+$labels['longmay'] = 'Maj';
+$labels['longjun'] = 'Juni';
+$labels['longjul'] = 'Juli';
+$labels['longaug'] = 'Augusti';
+$labels['longsep'] = 'September';
+$labels['longoct'] = 'Oktober';
+$labels['longnov'] = 'November';
+$labels['longdec'] = 'December';
 $labels['today'] = 'Idag';
-
-// toolbar buttons
 $labels['checkmail'] = 'Hämta nya meddelanden';
 $labels['writenewmessage'] = 'Skapa nytt meddelande';
 $labels['replytomessage'] = 'Svara avsändaren';
@@ -143,7 +118,6 @@ $labels['markread'] = 'Läst';
 $labels['markunread'] = 'Oläst';
 $labels['markflagged'] = 'Flaggat';
 $labels['markunflagged'] = 'Oflaggat';
-
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
@@ -151,21 +125,17 @@ $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
 $labels['unanswered'] = 'Obesvarade';
 $labels['filter'] = 'Filter';
-
 $labels['compact'] = 'Packa';
 $labels['empty'] = 'Töm';
 $labels['purge'] = 'Rensa';
-
 $labels['quota'] = 'Diskutrymme';
 $labels['unknown'] = 'okänt';
 $labels['unlimited'] = 'obegränsat';
-
 $labels['quicksearch'] = 'Snabbsök';
 $labels['resetsearch'] = 'Återställ sökning';
-
+$labels['searchmod'] = 'Sökalternativ';
+$labels['msgtext'] = 'Hela meddelandet';
 $labels['openinextwin'] = 'Öppna i nytt fönster';
-
-// message compose
 $labels['compose'] = 'Skapa nytt meddelande';
 $labels['savemessage'] = 'Spara utkast';
 $labels['sendmessage'] = 'Skicka meddelande';
@@ -173,94 +143,72 @@ $labels['addattachment'] = 'Bifoga fil';
 $labels['charset'] = 'Teckenkodning';
 $labels['editortype'] = 'Typ av redigerare';
 $labels['returnreceipt'] = 'Mottagarkvitto';
-
 $labels['checkspelling'] = 'Kontrollera stavning';
 $labels['resumeediting'] = 'Återuppta redigering';
 $labels['revertto'] = 'Återgå till';
-
 $labels['attachments'] = 'Bilagor';
 $labels['upload'] = 'Bifoga';
 $labels['close'] = 'Stäng';
-
 $labels['low'] = 'Låg';
 $labels['lowest'] = 'Lägst';
 $labels['normal'] = 'Normal';
 $labels['high'] = 'Hög';
 $labels['highest'] = 'Högst';
-
 $labels['nosubject'] = '(inget ämne)';
 $labels['showimages'] = 'Visa bilder';
 $labels['alwaysshow'] = 'Visa alltid bilder från $sender';
-
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text';
 $labels['savesentmessagein'] = 'Spara kopia i';
 $labels['dontsave'] = 'Spara inte';
 $labels['maxuploadsize'] = 'Tillåten filstorlek är $size';
-
 $labels['addcc'] = 'Kopia';
 $labels['addbcc'] = 'Hemlig kopia';
 $labels['addreplyto'] = 'Svara till';
-
-// mdn
 $labels['mdnrequest'] = 'Avsändaren har begärt mottagarkvitto för det här meddelandet. Vill du skicka ett mottagarkvitto?';
 $labels['receiptread'] = 'Mottagarkvitto (läst)';
 $labels['yourmessage'] = 'Det här är ett mottagarkvitto för ditt meddelande';
 $labels['receiptnote'] = 'Notera: Mottagarkvittot innebär bara att meddelandet visats på mottagarens dator. Därmed finns ingen garanti att mottagaren har läst och förstått meddelandet.';
-
-// address boook
 $labels['name'] = 'Namn';
 $labels['firstname'] = 'Förnamn';
 $labels['surname'] = 'Efternamn';
 $labels['email'] = 'E-post';
-
 $labels['addcontact'] = 'Lägg till ny kontakt';
 $labels['editcontact'] = 'Redigera kontakt';
-
 $labels['edit'] = 'Redigera';
 $labels['cancel'] = 'Avbryt';
 $labels['save'] = 'Spara';
 $labels['delete'] = 'Radera';
-
 $labels['newcontact'] = 'Ny kontakt';
 $labels['deletecontact'] = 'Radera vald kontakt';
 $labels['composeto'] = 'Skriv meddelande till vald kontakt';
 $labels['contactsfromto'] = 'Kontakt $from till $to av $count';
 $labels['print'] = 'Skriv ut';
 $labels['export'] = 'Exportera';
-$labels['exportvcards']   = 'Exportera kontakter';
-
+$labels['exportvcards'] = 'Exportera kontakter';
 $labels['previouspage'] = 'Visa föregående grupp';
 $labels['firstpage'] = 'Visa första gruppen';
 $labels['nextpage'] = 'Visa nästa grupp';
 $labels['lastpage'] = 'Visa sista gruppen';
-
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Personliga adresser';
-
 $labels['import'] = 'Importera';
 $labels['importcontacts'] = 'Importera kontakter';
 $labels['importfromfile'] = 'Importera från fil:';
 $labels['importreplace'] = 'Ersätt samtliga kontakter i adressboken';
 $labels['importtext'] = 'Kontakter kan importeras från en befintlig adressbok.<br/>För närvarande stöds import av adresser i <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>-format.';
 $labels['done'] = 'Klart';
-
-// settings
 $labels['settingsfor'] = 'Inställningar för';
-
 $labels['preferences'] = 'Inställningar';
 $labels['userpreferences'] = 'Användarinställningar';
 $labels['editpreferences'] = 'Ändra användarinställningar';
-
 $labels['identities'] = 'Profiler';
 $labels['manageidentities'] = 'Hantera profiler för detta konto';
 $labels['newidentity'] = 'Ny profil';
-
 $labels['newitem'] = 'Ny post';
 $labels['edititem'] = 'Ändra post';
-
 $labels['setdefault'] = 'Sätt som standard';
-$labels['autodetect']  = 'Automatiskt';
+$labels['autodetect'] = 'Automatiskt';
 $labels['language'] = 'Språk';
 $labels['timezone'] = 'Tidszon';
 $labels['pagesize'] = 'Rader per sida';
@@ -288,8 +236,8 @@ $labels['always'] = 'Alltid';
 $labels['showinlineimages'] = 'Visa bifogade bilder efter meddelande';
 $labels['autosavedraft'] = 'Spara utkast med automatiskt intervall';
 $labels['everynminutes'] = '$n min';
-$labels['keepaliveevery']  = '$n min';
-$labels['keepalive']  = 'Hämta nya meddelanden med automatiskt intervall';
+$labels['keepaliveevery'] = '$n min';
+$labels['keepalive'] = 'Hämta nya meddelanden med automatiskt intervall';
 $labels['never'] = 'Aldrig';
 $labels['messagesdisplaying'] = 'Visning av meddelanden';
 $labels['messagescomposition'] = 'Redigering av meddelanden';
@@ -300,7 +248,6 @@ $labels['2047folding'] = 'Full RFC 2047 (övriga)';
 $labels['advancedoptions'] = 'Avancerade inställningar';
 $labels['focusonnewmessage'] = 'Fokusera webbläsarens fönster vid nytt meddelande';
 $labels['checkallfolders'] = 'Genomsök samtliga kataloger efter nya meddelanden';
-
 $labels['folder'] = 'Katalog';
 $labels['folders'] = 'Kataloger';
 $labels['foldername'] = 'Katalognamn';
@@ -313,12 +260,9 @@ $labels['renamefolder'] = 'Byt katalognamn';
 $labels['deletefolder'] = 'Radera katalog';
 $labels['managefolders'] = 'Hantera kataloger';
 $labels['specialfolders'] = 'Speciella kataloger';
-
 $labels['sortby'] = 'Sortera på';
 $labels['sortasc'] = 'Sortera stigande';
 $labels['sortdesc'] = 'Sortera fallande';
-
-// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index cb82624d0..6490cb17a 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -20,28 +20,20 @@
 */
 
 $labels = array();
-
-// login page
 $labels['welcome'] = '歡迎使用 $product';
 $labels['username'] = '使用者名稱';
 $labels['password'] = '使用者密碼';
 $labels['server'] = '伺服器';
 $labels['login'] = '登入';
-
-// taskbar
 $labels['logout'] = '登出';
 $labels['mail'] = '電子郵件';
 $labels['settings'] = '個人設定';
 $labels['addressbook'] = '通訊錄';
-
-// mailbox names
 $labels['inbox'] = '收件匣';
 $labels['drafts'] = '草稿匣';
 $labels['sent'] = '寄件備份';
 $labels['trash'] = '垃圾桶';
 $labels['junk'] = '垃圾郵件';
-
-// message listing
 $labels['subject'] = '主旨';
 $labels['from'] = '寄件者';
 $labels['to'] = '收件者';
@@ -52,36 +44,25 @@ $labels['date'] = '日期';
 $labels['size'] = '大小';
 $labels['priority'] = '優先順序';
 $labels['organization'] = '組織';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
+$labels['reply-to'] = '回覆至';
 $labels['mailboxlist'] = '資料夾';
 $labels['messagesfromto'] = '郵件 $from 至 $to，共有 $count 封郵件';
 $labels['messagenrof'] = '第 $nr 封郵件，共有 $count 封';
-
 $labels['moveto'] = '移至...';
 $labels['download'] = '下載';
-
 $labels['filename'] = '檔案名稱';
 $labels['filesize'] = '檔案大小';
-
 $labels['preferhtml'] = '使用 HTML 顯示';
 $labels['htmlmessage'] = 'HTML 郵件';
 $labels['prettydate'] = '簡短日期顯示';
-
 $labels['addtoaddressbook'] = '新增至通訊錄';
-
-// weekdays short
-$labels['sun'] = '日';
-$labels['mon'] = '一';
-$labels['tue'] = '二';
-$labels['wed'] = '三';
-$labels['thu'] = '四';
-$labels['fri'] = '五';
-$labels['sat'] = '六';
-
-// weekdays long
+$labels['sun'] = '週日';
+$labels['mon'] = '週一';
+$labels['tue'] = '週二';
+$labels['wed'] = '週三';
+$labels['thu'] = '週四';
+$labels['fri'] = '週五';
+$labels['sat'] = '週六';
 $labels['sunday'] = '星期日';
 $labels['monday'] = '星期一';
 $labels['tuesday'] = '星期二';
@@ -89,8 +70,6 @@ $labels['wednesday'] = '星期三';
 $labels['thursday'] = '星期四';
 $labels['friday'] = '星期五';
 $labels['saturday'] = '星期六';
-
-// months short
 $labels['jan'] = '一';
 $labels['feb'] = '二';
 $labels['mar'] = '三';
@@ -103,8 +82,6 @@ $labels['sep'] = '九';
 $labels['oct'] = '十';
 $labels['nov'] = '十一';
 $labels['dec'] = '十二';
-
-// months long
 $labels['longjan'] = '一月';
 $labels['longfeb'] = '二月';
 $labels['longmar'] = '三月';
@@ -117,17 +94,14 @@ $labels['longsep'] = '九月';
 $labels['longoct'] = '十月';
 $labels['longnov'] = '十一月';
 $labels['longdec'] = '十二月';
-
 $labels['today'] = '今日';
-
-// toolbar buttons
 $labels['checkmail'] = '檢查新郵件';
 $labels['writenewmessage'] = '撰寫新郵件';
 $labels['replytomessage'] = '回覆';
 $labels['replytoallmessage'] = '全部回覆';
 $labels['forwardmessage'] = '轉寄';
 $labels['deletemessage'] = '刪除郵件';
-$labels['movemessagetotrash'] = '移動郵件至' . $labels['trash'];
+$labels['movemessagetotrash'] = '移動郵件至垃圾桶';
 $labels['printmessage'] = '列印此郵件';
 $labels['previousmessage'] = '顯示上一封郵件';
 $labels['previousmessages'] = '顯示上一頁';
@@ -144,26 +118,24 @@ $labels['markread'] = '標示為已讀取';
 $labels['markunread'] = '標示為未讀取';
 $labels['markflagged'] = '標上旗標';
 $labels['markunflagged'] = '移除旗標';
-
 $labels['select'] = '選取';
-$labels['all'] = '全部';
+$labels['all'] = '全部郵件';
 $labels['none'] = '無';
-$labels['unread'] = '未讀取';
-
+$labels['unread'] = '未讀取的郵件';
+$labels['flagged'] = '已加標記的郵件';
+$labels['unanswered'] = '未回覆的郵件';
+$labels['filter'] = '篩選範圍';
 $labels['compact'] = '壓縮';
 $labels['empty'] = '清空';
 $labels['purge'] = '清除';
-
 $labels['quota'] = '磁碟使用量';
 $labels['unknown'] = '未知';
 $labels['unlimited'] = '無限制';
-
 $labels['quicksearch'] = '快速搜尋';
 $labels['resetsearch'] = '重設搜尋';
-
+$labels['searchmod'] = '修改搜尋';
+$labels['msgtext'] = '整封郵件';
 $labels['openinextwin'] = '在新視窗開啟';
-
-// message compose
 $labels['compose'] = '撰寫新郵件';
 $labels['savemessage'] = '儲存成草稿';
 $labels['sendmessage'] = '立即寄出';
@@ -171,55 +143,42 @@ $labels['addattachment'] = '增加附件檔案';
 $labels['charset'] = '郵件編碼';
 $labels['editortype'] = '編輯器類型';
 $labels['returnreceipt'] = '要求讀取回條';
-
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
 $labels['revertto'] = '恢復至';
-
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
 $labels['close'] = '關閉';
-
 $labels['low'] = '低';
 $labels['lowest'] = '最低';
 $labels['normal'] = '普通';
 $labels['high'] = '高';
 $labels['highest'] = '最高';
-
 $labels['nosubject'] = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
-
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '純文字';
 $labels['savesentmessagein'] = '儲存寄件備份至';
 $labels['dontsave'] = '不要儲存';
 $labels['maxuploadsize'] = '上傳檔案大小限制為 $size';
-
 $labels['addcc'] = '新增副本';
 $labels['addbcc'] = '新增密件副本';
 $labels['addreplyto'] = '新增回覆地址';
-
-// mdn
 $labels['mdnrequest'] = '此郵件的寄件者希望在你閱讀此郵件時受到通知。你想要通知寄件者嗎？';
 $labels['receiptread'] = '郵件回條（已閱讀）';
 $labels['yourmessage'] = '這是你郵件的郵件回條';
 $labels['receiptnote'] = '注意：此回條只能確認收件者的電腦顯示了郵件，並不能保證收件者已閱讀或了解郵件的內容。';
-
-// address book
 $labels['name'] = '顯示名稱';
 $labels['firstname'] = '名稱';
 $labels['surname'] = '姓氏';
 $labels['email'] = '電子郵件';
-
 $labels['addcontact'] = '新增聯絡人';
 $labels['editcontact'] = '編輯聯絡人';
-
 $labels['edit'] = '編輯';
 $labels['cancel'] = '取消';
 $labels['save'] = '儲存';
 $labels['delete'] = '刪除';
-
 $labels['newcontact'] = '建立新聯絡人資料';
 $labels['deletecontact'] = '刪除所選擇的聯絡人';
 $labels['composeto'] = '寄信至所選擇的聯絡人';
@@ -227,36 +186,27 @@ $labels['contactsfromto'] = '聯絡人 $from 至 $to，共有 $count 人';
 $labels['print'] = '列印';
 $labels['export'] = '匯出通訊錄';
 $labels['exportvcards'] = '匯出通訊錄為 vCard 格式';
-
 $labels['previouspage'] = '顯示上一頁';
 $labels['firstpage'] = '顯示第一頁';
 $labels['nextpage'] = '顯示下一頁';
 $labels['lastpage'] = '顯示最後一頁';
-
 $labels['groups'] = '群組';
 $labels['personaladrbook'] = '個人住址';
-
 $labels['import'] = '匯入通訊錄';
 $labels['importcontacts'] = '由檔案匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
 $labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
 $labels['importtext'] = '你可以由已存在的通訊錄上傳資料，<br/>目前系統僅支援匯入 <a href="http://zh.wikipedia.org/wiki/VCard" target="_blank">vCard</a> 格式的資料。';
 $labels['done'] = '完成';
-
-// settings
 $labels['settingsfor'] = '設定';
-
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = '個人設定';
 $labels['editpreferences'] = '編輯個人設定';
-
 $labels['identities'] = '身份資訊';
 $labels['manageidentities'] = '管理此帳號的身份資訊';
 $labels['newidentity'] = '新增身份資訊';
-
 $labels['newitem'] = '新增項目';
 $labels['edititem'] = '編輯項目';
-
 $labels['setdefault'] = '設成預設i值';
 $labels['autodetect'] = '自動選擇';
 $labels['language'] = '語言';
@@ -268,8 +218,8 @@ $labels['htmleditor'] = '使用 HTML 撰寫郵件';
 $labels['htmlsignature'] = 'HTML 簽名檔';
 $labels['previewpane'] = '顯示預覽窗格';
 $labels['skin'] = '版面風格';
-$labels['logoutclear'] = '登出時清空' . $labels['trash'];
-$labels['logoutcompact'] = '登出時壓縮' . $labels['inbox'];
+$labels['logoutclear'] = '登出時清空垃圾桶';
+$labels['logoutcompact'] = '登出時壓縮收件匣';
 $labels['uisettings'] = '使用介面設定';
 $labels['serversettings'] = '伺服器設定';
 $labels['mailboxview'] = '信箱顯示設定';
@@ -277,15 +227,27 @@ $labels['mdnrequests'] = '讀取回條回應';
 $labels['askuser'] = '詢問使用者';
 $labels['autosend'] = '自動送出';
 $labels['ignore'] = '完全忽略';
-$labels['readwhendeleted'] = '將刪除的信件標示為已讀取';
-$labels['flagfordeletion'] = '刪除信件時將原始信件標示為已刪除';
+$labels['readwhendeleted'] = '將刪除的郵件標示為已讀取';
+$labels['flagfordeletion'] = '刪除郵件時將原始郵件標示為已刪除';
+$labels['skipdeleted'] = '不要顯示已刪除的郵件';
+$labels['showremoteimages'] = '顯示遠端郵件內文中的圖片';
+$labels['fromknownsenders'] = '從已知的寄件者';
+$labels['always'] = '總是接受';
 $labels['showinlineimages'] = '將附加檔案的圖片顯示於郵件最後';
 $labels['autosavedraft'] = '自動儲存草稿';
 $labels['everynminutes'] = '每 $n 分鐘';
-$labels['never'] = '絕不';
+$labels['keepaliveevery'] = '每 $n 分鐘';
+$labels['keepalive'] = '檢查新郵件的間隔時間';
+$labels['never'] = '絕對不要';
 $labels['messagesdisplaying'] = '郵件顯示設定';
 $labels['messagescomposition'] = '撰寫郵件設定';
-
+$labels['mimeparamfolding'] = '附加檔案名稱的編碼方式';
+$labels['2231folding'] = '完全 RFC 2231 模式 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 混合模式 (MS Outlook)';
+$labels['2047folding'] = '完全 RFC 2047 模式 (其他)';
+$labels['advancedoptions'] = '顯示進階設定選項';
+$labels['focusonnewmessage'] = '收到新郵件時使瀏覽器獲得焦點';
+$labels['checkallfolders'] = '檢查所有資料夾中的新郵件';
 $labels['folder'] = '資料夾';
 $labels['folders'] = '資料夾';
 $labels['foldername'] = '資料夾名稱';
@@ -298,9 +260,12 @@ $labels['renamefolder'] = '重新命名資料夾';
 $labels['deletefolder'] = '刪除資料夾';
 $labels['managefolders'] = '管理資料夾';
 $labels['specialfolders'] = '預設資料夾設定';
-
 $labels['sortby'] = '排序';
 $labels['sortasc'] = '遞增排序';
 $labels['sortdesc'] = '遞減排序';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index d278b9e27..754cf0a60 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -33,7 +33,7 @@ $messages['checkingmail'] = '檢查新郵件...';
 $messages['sendingmessage'] = '寄出郵件中...';
 $messages['messagesent'] = '郵件寄出成功';
 $messages['savingmessage'] = '儲存郵件中...';
-$messages['messagesaved'] = '訊息已經存至' . $labels['drafts'];
+$messages['messagesaved'] = '訊息已經存至';
 $messages['successfullysaved'] = '儲存成功';
 $messages['addedsuccessfully'] = '聯絡人已經成功地新增至通訊錄';
 $messages['contactexists'] = '此聯絡人的電子郵件位址已存在';
@@ -42,7 +42,7 @@ $messages['encryptedmessage'] = '此郵件經過加密，因此無法顯示。�
 $messages['nocontactsfound'] = '沒有找到任何聯絡人';
 $messages['contactnotfound'] = '找不到要求的聯絡人';
 $messages['sendingfailed'] = '郵件寄出失敗';
-$messages['senttooquickly'] = '你寄出的信件太過於頻繁，請稍候 $sec 秒後再試一次。';
+$messages['senttooquickly'] = '你寄出的郵件太過於頻繁，請稍候 $sec 秒後再試一次。';
 $messages['errorsavingsent'] = '儲存寄件備份時發生錯誤';
 $messages['errorsaving'] = '儲存時發生錯誤';
 $messages['errormoving'] = '無法移動此郵件';
@@ -54,10 +54,12 @@ $messages['purgefolderconfirm'] = '你確定要刪除這個資料夾裡面所有
 $messages['foldercreating'] = '建立資料夾中...';
 $messages['folderdeleting'] = '刪除資料夾中...';
 $messages['folderrenaming'] = '重新命名資料夾中...';
+$messages['foldermoving'] = '移動資料夾中...';
 $messages['formincomplete'] = '這個表單有部分未填，請完整填寫';
 $messages['noemailwarning'] = '請輸入一個有效的電子郵件位址';
 $messages['nonamewarning'] = '請輸入名字';
 $messages['nopagesizewarning'] = '請輸入一頁顯示多少郵件';
+$messages['nosenderwarning'] = '請輸入寄件者的電子郵件位址';
 $messages['norecipientwarning'] = '請輸入至少一位收信者';
 $messages['nosubjectwarning'] = '「主旨」欄是空的。你要輸入一個主旨嗎？';
 $messages['nobodywarning'] = '要傳送沒有內文的郵件嗎？';
@@ -92,5 +94,7 @@ $messages['importwait'] = '匯入中，請稍候...';
 $messages['importerror'] = '匯入失敗！上傳的檔案並非支援的 vCard 格式。';
 $messages['importconfirm'] = '<b>成功匯入 $inserted 筆資料，略過 $skipped 筆已存在的資料</b>：<p><em>$names</em></p>';
 $messages['opnotpermitted'] = '不允許的操作';
+$messages['nofromaddress'] = '在選擇的身分中遺失了電子郵件位址';
+$messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有設定的樣式。您確定要繼續嗎？';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index b0a2a7e81..f6e29f9d7 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -63,6 +63,11 @@ if ($RCMAIL->action=='display-attachment')
 // use common temp dir for file uploads
 $temp_dir = unslashify($CONFIG['temp_dir']);
 
+// #1484529: we need absolute path on Windows for move_uploaded_file()
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+  $temp_dir = realpath($temp_dir);
+}
+
 if (!is_array($_SESSION['compose']['attachments'])) {
   $_SESSION['compose']['attachments'] = array();
 }
@@ -73,7 +78,7 @@ $OUTPUT->reset();
 if (is_array($_FILES['_attachments']['tmp_name'])) {
   foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
     $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
-    if (move_uploaded_file($filepath, $tmpfname)) {
+    if (move_uploaded_file($filepath, $tmpfname) && file_exists($tmpfname)) {
       $id = count($_SESSION['compose']['attachments']);
       $_SESSION['compose']['attachments'][] = array(
         'name' => $_FILES['_attachments']['name'][$i],
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 26acc88c2..b1aba7d62 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -19,7 +19,7 @@
 
 */
 
-$MAXNUM = 15;  // same limit as in app.js
+$MAXNUM = 15;
 $contacts = array();
 $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
 
@@ -33,12 +33,11 @@ if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST)) {
       while ($sql_arr = $result->iterate()) {
         if (stripos((string)$sql_arr['email'], $search) !== false || stripos((string)$sql_arr['name'], $search) !== false) {
           $contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+	  if (count($contacts) >= $MAXNUM)
+            break 2;
         }
       }
     }
-    
-    if (count($contacts) >= $MAXNUM)
-      break;
   }
   
   sort($contacts);
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 1b83b1ed4..49c4c3011 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -70,8 +70,10 @@ if ($msg_uid = $_SESSION['compose']['param']['_reply_uid'])
   $compose_mode = RCUBE_COMPOSE_REPLY;
 else if ($msg_uid = $_SESSION['compose']['param']['_forward_uid'])
   $compose_mode = RCUBE_COMPOSE_FORWARD;
-else if ($msg_uid = $_SESSION['compose']['param']['_draft_uid'])
+else if ($msg_uid = $_SESSION['compose']['param']['_draft_uid']) {
+  $RCMAIL->imap->set_mailbox($CONFIG['drafts_mbox']);
   $compose_mode = RCUBE_COMPOSE_DRAFT;
+}
 
 if (!empty($msg_uid))
 {
@@ -488,7 +490,7 @@ function rcmail_create_reply_body($body, $bodyIsHtml)
       }
 
     // add title line(s)
-    $prefix = wordwrap(sprintf("On %s, %s wrote:\n",
+    $prefix = rc_wordwrap(sprintf("On %s, %s wrote:\n",
       $MESSAGE->headers->date,
       $MESSAGE->get_header('from')), 76);
 
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 79e148d8a..8931cfa4e 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -660,7 +660,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces)
     '/<title>.*<\/title>/i',		// PHP bug #32547 workaround: remove title tag
     '/<html[^>]*>/im',			// malformed html: remove html tags (#1485139)
     '/<\/html>/i',			// malformed html: remove html tags (#1485139)
-    '/^[\xFE\xFF\xBB\xBF\x00]+((?:<\!doctype|\<html))/im',	// remove byte-order mark (only outlook?)
+    '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/',	// byte-order mark (only outlook?)
   );
   $html_replace = array(
     '\\1'.' &nbsp; '.'\\3',
@@ -669,7 +669,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces)
     '',
     '',
     '',
-    '\\1',
+    '',
   );
   $html = preg_replace($html_search, $html_replace, $html);
 
@@ -1179,7 +1179,7 @@ function rcmail_wrap_quoted($text, $max = 76)
         $prefix = substr($line, 0, $length);
 
         // Remove '> ' from the line, then wordwrap() the line
-        $line = wordwrap(substr($line, $length), $max - $length);
+        $line = rc_wordwrap(substr($line, $length), $max - $length);
 
         // Rebuild the line with '> ' at the beginning of each 'subline'
         $newline = '';
@@ -1191,7 +1191,7 @@ function rcmail_wrap_quoted($text, $max = 76)
         $line = rtrim($newline);
       }
       else {
-        $line = wordwrap($line, $max);
+        $line = rc_wordwrap($line, $max);
       }
     }
 
@@ -1308,7 +1308,14 @@ function rcmail_deliver_message(&$message, $from, $mailto)
     // reset stored headers and overwrite
     $message->_headers = array();
     $header_str = $message->txtHeaders($headers_php);
-  
+    
+    // #1485779
+    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+      if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
+        $headers_enc['To'] = implode(', ', $m[1]);
+        }
+      }
+       
     if (ini_get('safe_mode'))
       $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
     else
@@ -1390,7 +1397,7 @@ function rcmail_send_mdn($uid)
                "Disposition: manual-action/MDN-sent-manually; displayed\r\n";
     
     $compose->headers($headers);
-    $compose->setTXTBody(wordwrap($body, 75, "\r\n"));
+    $compose->setTXTBody(rc_wordwrap($body, 75, "\r\n"));
     $compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');
 
     $sent = rcmail_deliver_message($compose, $identity['email'], $mailto);
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 5cc2a574d..d32e93996 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -19,6 +19,10 @@
 
 */
 
+if (!$OUTPUT->ajax_call) {
+  return;
+}
+
 // is there a sort type for this request?
 if ($sort = get_input_value('_sort', RCUBE_INPUT_GET))
 {
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index eb81fc9ad..9607619e9 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -302,10 +302,10 @@ if ($isHtml)
   $MAIL_MIME->setHTMLBody($message_body . ($footer ? "\r\n<pre>".$footer.'</pre>' : ''));
 
   // add a plain text version of the e-mail as an alternative part.
-  $h2t = new html2text($message_body);
-  $plainTextPart = $h2t->get_text() . ($footer ? "\r\n".$footer : '');
+  $h2t = new html2text($message_body, false, true, 0);
+  $plainTextPart = rc_wordwrap($h2t->get_text(), 75, "\r\n"). ($footer ? "\r\n".$footer : '');
   $plainTextPart = wordwrap($plainTextPart, 998, "\r\n", true);
-  if (!strlen($plainTextPart)) 
+  if (!strlen($plainTextPart))
     { 
     // empty message body breaks attachment handling in drafts 
     $plainTextPart = "\r\n"; 
@@ -317,7 +317,7 @@ if ($isHtml)
   }
 else
   {
-  $message_body = wordwrap($message_body, 75, "\r\n");
+  $message_body = rc_wordwrap($message_body, 75, "\r\n");
   if ($footer)
     $message_body .= "\r\n" . $footer;
   $message_body = wordwrap($message_body, 998, "\r\n", true);
@@ -342,7 +342,7 @@ if (is_array($_SESSION['compose']['attachments']))
     if ($isHtml && ($match > 0))
     {
       $message_body = preg_replace($dispurl, ' src="'.$attachment['name'].'" ', $message_body);
-      $MAIL_MIME->setHTMLBody($message_body. ($footer ? "\r\n<pre>".$footer.'</pre>' : ''));
+      $MAIL_MIME->setHTMLBody($message_body);
       $MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name']);
     }
     else
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 9d3ff4c51..4129409bb 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -43,7 +43,7 @@ else {
     return;
   }
   else if (IDENTITIES_LEVEL == 1)
-    $IDENTITY_RECORD['email'] = rcmail_get_email();
+    $IDENTITY_RECORD['email'] = $RCMAIL->user->get_username();
 }
 
 
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index d0a3ae69c..3f0357717 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -469,24 +469,6 @@ function rcmail_get_skins()
   }
 
 
-function rcmail_get_email()
-  {
-  global $RCMAIL;
-  
-  if (strpos($RCMAIL->user->data['username'], '@'))
-    return $RCMAIL->user->data['username'];
-  else {
-    if ($RCMAIL->config->get('virtuser_file'))
-      $user_email = rcube_user::user2email($RCMAIL->user->data['username']);
-
-    if ($user_email == '')
-      $user_email = sprintf('%s@%s', $RCMAIL->user->data['username'], 
-    	    $RCMAIL->config->mail_domain($_SESSION['imap_host']));
-
-    return $user_email;
-    }		      
-  }
-
 // register UI objects
 $OUTPUT->add_handlers(array(
   'userprefs' => 'rcmail_user_prefs_form',
@@ -494,5 +476,4 @@ $OUTPUT->add_handlers(array(
   'itentitieslist' => 'rcmail_identities_list'  // keep this for backward compatibility
 ));
 
-
 ?>
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index b34575dce..dba385f49 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -86,7 +86,7 @@ if ($_POST['_iid'])
 else if (IDENTITIES_LEVEL < 2)
 {
   if (IDENTITIES_LEVEL == 1)
-    $save_data['email'] = rcmail_get_email();
+    $save_data['email'] = $RCMAIL->user->get_username();
 
   if ($save_data['email'] && ($insert_id = $USER->insert_identity($save_data)))
   {
diff --git a/skins/default/common.css b/skins/default/common.css
index ec2cd526f..34ea1d2b8 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -364,19 +364,13 @@ table.records-table tr.unfocused td
   top: 2px;
   left: 20px;
   width: 140px;
+  height: 15px;
   font-size: 11px;
   padding: 0px;
   border: none;
 }
 
 
-/*\*/
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) { background-image: none; }
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) a { top: 5px; }
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
-/**/
-
-
 /***** roundcube webmail pre-defined classes *****/
 
 #rcversion
diff --git a/skins/default/mail.css b/skins/default/mail.css
index bb614dbd7..5a4e57bfe 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -820,6 +820,7 @@ div.message-htmlpart a
 }
 
 div.message-part pre,
+div.message-htmlpart pre,
 div.message-part div.pre
 {
   margin: 0px;
@@ -918,12 +919,12 @@ div.message-htmlpart div.rcmBody
 {
   position: absolute;
   top: 90px;
-  left: 200px;
+  left: 190px;
   right: 25px;
   bottom: 30px;
   margin: 0px;
   /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-220)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-210)+'px');
   height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
 }
 
diff --git a/skins/default/print.css b/skins/default/print.css
index fa9c38c7e..441a5de91 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -103,6 +103,8 @@ div.message-part a
   color: #0000CC;
 }
 
+div.message-part pre,
+div.message-htmlpart pre,
 div.message-part div.pre
 {
   margin: 0;
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 5c4bd56dc..6c984ab67 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -132,6 +132,14 @@ span.tablink-selected a
   background-color: #F9F9F9;
 }
 
+#subscription-table
+{
+  width: 100%;
+  /* css hack for IE */
+  width: expression('auto');
+}
+
+#subscription-table tbody td,
 #identities-table tbody td
 {
   cursor: default;
@@ -149,6 +157,45 @@ span.tablink-selected a
   width: 45%;
 }
 
+#subscription-table tr.virtual td
+{
+  color: #666;
+}
+
+#subscription-table tr.selected td,
+#subscription-table tr.selected td a
+{
+  color: #FFFFFF;
+  background-color: #CC3333;
+}
+
+#subscription-table tr.droptarget td,
+#subscription-table tr.droptarget td a
+{
+  background-color: #FFFFA6;
+}
+
+#subscription-table thead td.name
+{
+  width: 360px;
+}
+
+#subscription-table thead td.msgcount
+{
+  width: 90px;
+}
+
+#subscription-table thead td.subscribed
+{
+  width: 90px;
+}
+
+#subscription-table thead td.rename,
+#subscription-table thead td.delete
+{
+  width: 30px;
+}
+
 #identity-frame
 {
   position: relative;
@@ -194,8 +241,7 @@ input.disabled
 
 #userprefs-title,
 #identity-title,
-div.boxtitle,
-#subscription-table thead td
+div.boxtitle
 {
   height: 12px !important;
   padding: 4px 20px 3px 6px;
@@ -220,57 +266,6 @@ div.settingspart
   padding: 10px;
 }
 
-#subscription-table
-{
-  width: 100%;
-  /* css hack for IE */ 
-  width: expression('auto');
-}
-
-#subscription-table tbody td
-{
-  height: 20px;
-  padding-left: 6px;
-  padding-right: 10px;
-  white-space: nowrap;
-  border-bottom: 1px solid #EBEBEB;
-  background-color: #F9F9F9;
-  cursor: default;
-}
-
-#subscription-table tr.virtual td
-{
-  color: #666;
-}
-
-#subscription-table tr.selected td,
-#subscription-table tr.selected td a
-{
-  color: #FFFFFF;
-  background-color: #CC3333;
-}
-
-#subscription-table tr.droptarget td,
-#subscription-table tr.droptarget td a
-{
-  background-color: #FFFFA6;
-}
-
-#subscription-table thead td.name
-{
-  width: 250px;
-}
-
-#subscription-table thead td.msgcount
-{
-  width: 90px;
-}
-
-#subscription-table thead td.subscribed
-{
-  width: 90px;
-}
-
 fieldset 
 {
   margin-bottom: 0.5em;
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 326ded296..ce295567b 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -41,7 +41,7 @@
 </div>
 
 <div id="quicksearchbar">
-<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
+<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>
 
 <roundcube:if condition="config:ldap_public" />
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index fb887ba5e..96be0f65e 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -136,7 +136,7 @@
 </div>
 
 <div id="quicksearchbar">
-<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
+<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>
 
 </body>
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index 8808f5130..5da5c22f1 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -16,7 +16,7 @@
 
 <div id="folder-manager">
 <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
-  cellpadding="1" cellspacing="0" summary="Folder subscription table"
+  cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table"
   deleteIcon="/images/icons/folder-trash.png"
   renameIcon="/images/icons/rename.png" />
 </div>