Index: /trunk/roundcubemail/program/include/main.inc
===================================================================
--- /trunk/roundcubemail/program/include/main.inc	(revision 826)
+++ /trunk/roundcubemail/program/include/main.inc	(revision 827)
@@ -843,4 +843,7 @@
   {
   global $DB, $CONFIG, $sess_user_lang;
+  
+  // merge (partial) prefs array with existing settings
+  $a_user_prefs += (array)$_SESSION['user_prefs'];
   
   $DB->query("UPDATE ".get_table_name('users')."