Update localizations from Transifex

232 files changed, 2211 insertions, 1774 deletions

diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
index acf80aca9..167788b4c 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -21,7 +21,7 @@ $labels['myrights'] = 'Pﾅ凖ｭstupovﾃ｡ prﾃ｡va';
 $labels['username'] = 'Uﾅｾivatel:';
 $labels['advanced'] = 'pokroﾄ絞lﾃｽ reﾅｾim';
 $labels['newuser'] = 'Pﾅ冓dat zﾃ｡znam';
-$labels['actions'] = 'Access right actions...';
+$labels['actions'] = 'Pﾅ凖ｭstupovﾃｩ prﾃ｡vo akce ...';
 $labels['anyone'] = 'Vﾅ｡ichni uﾅｾivatelﾃｩ (kdokoli)';
 $labels['anonymous'] = 'Hostﾃｩ (anonymnﾃｭ)';
 $labels['identifier'] = 'Identifikﾃ｡tor';
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index a287a413e..bb8837190 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -26,46 +26,46 @@ $labels['anyone'] = 'Tﾃｳdolos usuarios (calquera)';
 $labels['anonymous'] = 'Invitados (anﾃｳnimo)';
 $labels['identifier'] = 'Identificador';
 
-$labels['acll'] = 'Lookup';
+$labels['acll'] = 'Bloquear';
 $labels['aclr'] = 'Ler mensaxes';
 $labels['acls'] = 'Keep Seen state';
 $labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Insert (Copy into)';
 $labels['aclp'] = 'Post';
-$labels['aclc'] = 'Create subfolders';
-$labels['aclk'] = 'Create subfolders';
+$labels['aclc'] = 'Crear subcartafoles';
+$labels['aclk'] = 'Crear subcartafoles';
 $labels['acld'] = 'Borrar mensaxes';
 $labels['aclt'] = 'Borrar mensaxes';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Eliminar carpeta';
 $labels['acla'] = 'Administrar';
 
-$labels['aclfull'] = 'Full control';
-$labels['aclother'] = 'Other';
-$labels['aclread'] = 'Read';
-$labels['aclwrite'] = 'Write';
-$labels['acldelete'] = 'Delete';
+$labels['aclfull'] = 'Control total';
+$labels['aclother'] = 'Outros';
+$labels['aclread'] = 'Lectura';
+$labels['aclwrite'] = 'Escritura';
+$labels['acldelete'] = 'Borrado';
 
-$labels['shortacll'] = 'Lookup';
-$labels['shortaclr'] = 'Read';
-$labels['shortacls'] = 'Keep';
-$labels['shortaclw'] = 'Write';
-$labels['shortacli'] = 'Insert';
+$labels['shortacll'] = 'Busca';
+$labels['shortaclr'] = 'Ler';
+$labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortacli'] = 'Insertar';
 $labels['shortaclp'] = 'Post';
-$labels['shortaclc'] = 'Create';
-$labels['shortaclk'] = 'Create';
-$labels['shortacld'] = 'Delete';
-$labels['shortaclt'] = 'Delete';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Borrar';
+$labels['shortaclt'] = 'Borrar';
 $labels['shortacle'] = 'Expunge';
-$labels['shortaclx'] = 'Folder delete';
+$labels['shortaclx'] = 'Borrar cartafol';
 $labels['shortacla'] = 'Administrar';
 
-$labels['shortaclother'] = 'Other';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = 'Write';
-$labels['shortacldelete'] = 'Delete';
+$labels['shortaclother'] = 'Outros';
+$labels['shortaclread'] = 'Lectura';
+$labels['shortaclwrite'] = 'Escritura';
+$labels['shortacldelete'] = 'Borrado';
 
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longacll'] = 'O cartafol ﾃｩ visible e pode ser suscrito';
 $labels['longaclr'] = 'The folder can be opened for reading';
 $labels['longacls'] = 'Messages Seen flag can be changed';
 $labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
@@ -93,7 +93,7 @@ $messages['updateerror'] = 'Ubable to update access rights';
 $messages['deleteerror'] = 'Unable to delete access rights';
 $messages['createerror'] = 'Unable to add access rights';
 $messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
-$messages['norights'] = 'No rights has been specified!';
-$messages['nouser'] = 'No username has been specified!';
+$messages['norights'] = 'Non se especificaron permisos!';
+$messages['nouser'] = 'Non se especificou o nome de usuario!';
 
 ?>
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index b4927fb3f..11d905387 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -41,7 +41,7 @@ $labels['aclx'] = 'Elimina cartella';
 $labels['acla'] = 'Amministra';
 
 $labels['aclfull'] = 'Controllo completo';
-$labels['aclother'] = 'Altri';
+$labels['aclother'] = 'Altro';
 $labels['aclread'] = 'Lettura';
 $labels['aclwrite'] = 'Scrittura';
 $labels['acldelete'] = 'Elimina';
@@ -57,10 +57,10 @@ $labels['shortaclk'] = 'Crea';
 $labels['shortacld'] = 'Elimina';
 $labels['shortaclt'] = 'Elimina';
 $labels['shortacle'] = 'Elimina';
-$labels['shortaclx'] = 'Cancella cartella';
+$labels['shortaclx'] = 'Elimina cartella';
 $labels['shortacla'] = 'Amministra';
 
-$labels['shortaclother'] = 'Altri';
+$labels['shortaclother'] = 'Altro';
 $labels['shortaclread'] = 'Lettura';
 $labels['shortaclwrite'] = 'Scrittura';
 $labels['shortacldelete'] = 'Elimina';
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index 85e33725d..524427a4e 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -19,81 +19,81 @@
 $labels['sharing'] = '�ｳｵ�悛';
 $labels['myrights'] = '��滝ｷｼ �ｶ醐復';
 $labels['username'] = '�ぎ�圸�梵:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = '�ｳ��ｸ� �ｪｨ�糖';
 $labels['newuser'] = '�濫�敢�ｦｬ �ｶ緋ｰ�';
-$labels['actions'] = 'Access right actions...';
-$labels['anyone'] = 'All users (anyone)';
-$labels['anonymous'] = 'Guests (anonymous)';
+$labels['actions'] = '��滝ｷｼ �ｶ醐復 �徐�梠...';
+$labels['anyone'] = '�ｪｨ�蕩 �ぎ�圸�梵 (�符�ｬｴ�ｘ)';
+$labels['anonymous'] = '�ｰｩ�ｬｸ�梵 (�攘�ｪ�)';
 $labels['identifier'] = '�享�ｳ��梵';
 
-$labels['acll'] = 'Lookup';
-$labels['aclr'] = 'Read messages';
+$labels['acll'] = '�｡ｰ�嚮';
+$labels['aclr'] = '�攷�捩 �ｩ肥亨�ｧ�';
 $labels['acls'] = '�攷�捩 �メ��罹｡� �悛�ｧ�';
-$labels['aclw'] = 'Write flags';
-$labels['acli'] = 'Insert (Copy into)';
+$labels['aclw'] = '�堂�ｸｰ �ｹ��ｰ�';
+$labels['acli'] = '�た�桿 (�ｳｵ�ぎ�腹 �怱�ｹ�)';
 $labels['aclp'] = '�ｲ護亨';
 $labels['aclc'] = '�葺�怱 �抄�鵠 �ｧ誤豆�ｸｰ';
 $labels['aclk'] = '�葺�怱 �抄�鵠 �ｧ誤豆�ｸｰ';
 $labels['acld'] = '�ｩ肥亨�ｧ� �く���';
 $labels['aclt'] = '�ｩ肥亨�ｧ� �く���';
-$labels['acle'] = 'Expunge';
+$labels['acle'] = '����ｵｬ ��懋ｱｰ';
 $labels['aclx'] = '�抄�鵠 �く���';
 $labels['acla'] = '�ｴ��ｦｬ�梵';
 
-$labels['aclfull'] = 'Full control';
-$labels['aclother'] = 'Other';
-$labels['aclread'] = 'Read';
-$labels['aclwrite'] = 'Write';
-$labels['acldelete'] = 'Delete';
+$labels['aclfull'] = '����ｲｴ ��懍牟�ｶ�';
+$labels['aclother'] = '�ｸｰ�ム';
+$labels['aclread'] = '�攷�ｸｰ';
+$labels['aclwrite'] = '�堂�ｸｰ';
+$labels['acldelete'] = '�く���';
 
-$labels['shortacll'] = 'Lookup';
-$labels['shortaclr'] = 'Read';
-$labels['shortacls'] = 'Keep';
-$labels['shortaclw'] = 'Write';
-$labels['shortacli'] = 'Insert';
+$labels['shortacll'] = '�｡ｰ�嚮';
+$labels['shortaclr'] = '�攷�ｸｰ';
+$labels['shortacls'] = '�ｳｴ�ｴ�';
+$labels['shortaclw'] = '�堂�ｸｰ';
+$labels['shortacli'] = '�た�桿';
 $labels['shortaclp'] = '�ｲ護亨';
-$labels['shortaclc'] = 'Create';
-$labels['shortaclk'] = 'Create';
-$labels['shortacld'] = 'Delete';
-$labels['shortaclt'] = 'Delete';
-$labels['shortacle'] = 'Expunge';
+$labels['shortaclc'] = '��晧┳';
+$labels['shortaclk'] = '��晧┳';
+$labels['shortacld'] = '�く���';
+$labels['shortaclt'] = '�く���';
+$labels['shortacle'] = '�ｧ��它';
 $labels['shortaclx'] = '�抄�鵠 �く���';
-$labels['shortacla'] = '�ｴ��ｦｬ�梵';
+$labels['shortacla'] = '�ｴ��ｦｬ';
 
-$labels['shortaclother'] = 'Other';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = 'Write';
-$labels['shortacldelete'] = 'Delete';
+$labels['shortaclother'] = '�ｸｰ�ム';
+$labels['shortaclread'] = '�攷�ｸｰ';
+$labels['shortaclwrite'] = '�導';
+$labels['shortacldelete'] = '�く���';
 
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
-$labels['longaclr'] = 'The folder can be opened for reading';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = '�抄�鵠�乱 �ｩ肥亨�ｧ��･ｼ �ｳｵ�ぎ�葺�ｱｰ�ｘ �梠�┳�腹 ��� �梭�搆';
-$labels['longaclp'] = '�擽 �抄�鵠�｡� �ｩ肥亨�ｧ��･ｼ �ｲ護亨�腹 ��� �梭�搆';
-$labels['longaclc'] = '�擽 �抄�鵠�攪 �ｰ罷｡� �ｰ卓乱 �抄�鵠�･ｼ ��晧┳(��尖株 �擽�ｦ� �ｳ��ｲｽ)�腹 ��� �梭�搆';
-$labels['longaclk'] = '�擽 �抄�鵠�攪 �ｰ罷｡� �ｰ卓乱 �抄�鵠�･ｼ ��晧┳(��尖株 �擽�ｦ� �ｳ��ｲｽ)�腹 ��� �梭�搆';
-$labels['longacld'] = '�ｩ肥亨�ｧ� �く��� �伯�椈�ｷｸ�ｰ� �ｳ��ｲｽ�摺 ��� �梭�搆';
-$labels['longaclt'] = '�ｩ肥亨�ｧ� �く��� �伯�椈�ｷｸ�ｰ� �ｳ��ｲｽ�摺 ��� �梭�搆';
-$labels['longacle'] = 'Messages can be expunged';
-$labels['longaclx'] = '�抄�鵠�･ｼ �く��懦葺�ｱｰ�ｘ �擽�ｦ� �ｳ��ｲｽ �腹 ��� �梭�搆';
+$labels['longacll'] = '�抄�鵠�ｰ� �ｪｩ�｡晧乱 �ｘ�ム�ｘ�ｳ� �共�搆 �ぎ�圸�梵�ｰ� �ｵｬ�遵�腹 ��� �梭�搆:';
+$labels['longaclr'] = '�攷�ｸｰ �怱�紛 �抄�鵠�･ｼ �龍 ��� �梭�搆';
+$labels['longacls'] = '�攷�捩 �ｩ肥亨�ｧ� �ｹ��ｰ懍擽 �ｳ��ｲｽ�摺 ��� �梭�搆';
+$labels['longaclw'] = '�ｩ肥亨�ｧ� �ｹ��ｰ� �ｰ� �う�寥�糖�･ｼ �ｳ��ｲｽ�腹 ��� �梭�搆, �共�ｧ� �攷�搆 �ｰ� �く��罹勢�捩 ��懍匣';
+$labels['longacli'] = '�ｩ肥亨�ｧ��･ｼ �抄�鵠�乱 �ｳｵ�ぎ�葺�ｱｰ�ｘ �梠�┳�腹 ��� �梭�搆';
+$labels['longaclp'] = '�ｩ肥亨�ｧ��･ｼ �擽 �抄�鵠�｡� �ｲ護亨�腹 ��� �梭�搆';
+$labels['longaclc'] = '�擽 �抄�鵠�攪 �ｰ罷｡� �符�椈�乱 �抄�鵠�･ｼ ��晧┳(��尖株 �擽�ｦ� �ｳ��ｲｽ)�腹 ��� �梭�搆';
+$labels['longaclk'] = '�擽 �抄�鵠�攪 �ｰ罷｡� �符�椈�乱 �抄�鵠�･ｼ ��晧┳(��尖株 �擽�ｦ� �ｳ��ｲｽ)�腹 ��� �梭�搆';
+$labels['longacld'] = '�ｩ肥亨�ｧ� �く��� �ｹ��ｰ懍擽 �ｳ��ｲｽ�摺 ��� �梭�搆';
+$labels['longaclt'] = '�ｩ肥亨�ｧ� �く��� �ｹ��ｰ懍擽 �ｳ��ｲｽ�摺 ��� �梭�搆';
+$labels['longacle'] = '�ｩ肥亨�ｧ��ｰ� ����ｵｬ ��懋ｱｰ�摺 ��� �梭�搆';
+$labels['longaclx'] = '�抄�鵠�･ｼ �く��懦葺�ｱｰ�ｘ �擽�ｦ��揆 �ｳ��ｲｽ �腹 ��� �梭�搆';
 $labels['longacla'] = '�抄�鵠�攪 ��滝ｷｼ �ｶ醐復�揆 �ｳ��ｲｽ�腹 ��� �梭�搆';
 
 $labels['longaclfull'] = '�抄�鵠 �ｴ��ｦｬ�･ｼ �小�物�復 �ｪｨ�蕩 ��懍牟�ｶ�';
-$labels['longaclread'] = 'The folder can be opened for reading';
-$labels['longaclwrite'] = '�ｩ肥亨�ｧ��乱 �像�亨�葺�ｱｰ�ｘ, �抄�鵠�｡� �ｩ肥亨�ｧ��･ｼ �ｳｵ�ぎ�葺�ｱｰ�ｘ �梠�┳�腹 ��� �梭�搆';
+$labels['longaclread'] = '�抄�鵠�･ｼ �龍�牟 �攷�揆 ��� �梭�搆';
+$labels['longaclwrite'] = '�ｩ肥亨�ｧ��乱 �像�亨�葺�ｱｰ�ｘ, �抄�鵠�｡� �擽�徐�葺�ｱｰ�ｘ �ｳｵ�ぎ�腹 ��� �梭�搆';
 $labels['longacldelete'] = '�ｩ肥亨�ｧ��･ｼ �く��懦腹 ��� �梭�搆';
 
-$messages['deleting'] = '��滝ｷｼ �ｶ醐復 �く��� �､�...';
-$messages['saving'] = '��滝ｷｼ �ｶ醐復 ����棗 �､�...';
-$messages['updatesuccess'] = '��滝ｷｼ �ｶ醐復�揆 �ｳ��ｲｽ�葺�株�魂 �┳�ｳｵ �物.';
-$messages['deletesuccess'] = '��滝ｷｼ �ｶ醐復�揆 �く��懦葺�株�魂 �┳�ｳｵ �物.';
-$messages['createsuccess'] = '��滝ｷｼ �ｶ醐復�揆 �ｶ緋ｰ��葺�株�魂 �┳�ｳｵ �物.';
-$messages['updateerror'] = '��滝ｷｼ �ｶ醐復�揆 �ｰｱ�侠�腹 ��� �螺�搆.';
+$messages['deleting'] = '��滝ｷｼ �ｶ醐復�揆 �く��懦葺�株 �､�...';
+$messages['saving'] = '��滝ｷｼ �ｶ醐復�揆 ����棗�葺�株 �､�...';
+$messages['updatesuccess'] = '��滝ｷｼ �ｶ醐復�揆 �┳�ｳｵ����愍�｡� �ｳ��ｲｽ�物.';
+$messages['deletesuccess'] = '��滝ｷｼ �ｶ醐復�揆 �┳�ｳｵ����愍�｡� �く��懦物.';
+$messages['createsuccess'] = '��滝ｷｼ �ｶ醐復�揆 �┳�ｳｵ����愍�｡� �ｶ緋ｰ��物.';
+$messages['updateerror'] = '��滝ｷｼ �ｶ醐復�揆 �羅�魂�擽�敢�腹 ��� �螺�搆.';
 $messages['deleteerror'] = '��滝ｷｼ �ｶ醐復�揆 �く��懦腹 ��� �螺�搆.';
 $messages['createerror'] = '��滝ｷｼ �ｶ醐復�揆 �ｶ緋ｰ��腹 ��� �螺�搆.';
-$messages['deleteconfirm'] = '�│��晨復 �ぎ�圸�梵(�豆)�攪 ��滝ｷｼ �ｶ醐復�揆 �く��懦葺�ｳ��梵 �葺�株 �ｲ��擽 �剳�共 �鮒�笈�ｹ�?';
+$messages['deleteconfirm'] = '��簿ｧ尖｡� �│��晨復 �ぎ�圸�梵�攪 ��滝ｷｼ �ｶ醐復�揆 �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
 $messages['norights'] = '�ｧ���簿頗 �ｶ醐復�擽 �螺�搆!';
-$messages['nouser'] = '�ｧ���簿頗 username�擽 �螺�搆!';
+$messages['nouser'] = '�ｧ���簿頗 �ぎ�圸�梵�ｪ��擽 �螺�搆!';
 
 ?>
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index 6507504e2..59393012f 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -70,7 +70,7 @@ $labels['longaclr'] = 'Aplankﾄ� galima perﾅｾiﾅｫrﾄ葉i';
 $labels['longacls'] = 'Praneﾅ｡imﾅｳ vﾄ様iavﾄ様ﾄ� "Matyta" gali bﾅｫti pakeista';
 $labels['longaclw'] = 'Praneﾅ｡imﾅｳ vﾄ様iavﾄ様ﾄ耀 ir raktaﾅｾodﾅｾiai gali bﾅｫti pakeisti, iﾅ｡skyrus "Matytas" ir "Iﾅ｡trintas"';
 $labels['longacli'] = 'Praneﾅ｡imai gali bﾅｫti ﾄｯraﾅ｡yti arba nukopijuoti ﾄｯ aplankﾄ�';
-$labels['longaclp'] = 'Messages can be posted to this folder';
+$labels['longaclp'] = 'ﾄｮ ﾅ｡ﾄｯ aplankﾄ� galima dﾄ葉i laiﾅ｡kus.';
 $labels['longaclc'] = 'Nauji aplankai gali bﾅｫti kuriami (arba pervadinami) ﾅ｡ioje direktorijoje';
 $labels['longaclk'] = 'Nauji aplankai gali bﾅｫti kuriami (arba pervadinami) ﾅ｡ioje direktorijoje';
 $labels['longacld'] = 'Praneﾅ｡imﾅｳ vﾄ様iavﾄ様ﾄ� "Iﾅ｡trintas" gali bﾅｫti pakeista';
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 0c5171664..ebf314043 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -16,12 +16,12 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels['sharing'] = '蜈ｱ莠ｫ荳ｭ';
+$labels['sharing'] = '蜈ｱ莠ｫ';
 $labels['myrights'] = '隶ｿ髣ｮ譚�髯�';
 $labels['username'] = '逕ｨ謌ｷ�ｼ�';
 $labels['advanced'] = '鬮倡ｺｧ讓｡蠑�';
-$labels['newuser'] = '豺ｻ蜉�譚｡逶ｮ';
-$labels['actions'] = 'Access right actions...';
+$labels['newuser'] = '譁ｰ蠅樊擅逶ｮ';
+$labels['actions'] = '譚�髯占ｮｾ鄂ｮ...';
 $labels['anyone'] = '謇�譛臥畑謌ｷ(莉ｻ菴穂ｺｺ)';
 $labels['anonymous'] = '譚･螳ｾ(蛹ｿ蜷�)';
 $labels['identifier'] = '譬�隸�隨ｦ';
@@ -29,7 +29,7 @@ $labels['identifier'] = '譬�隸�隨ｦ';
 $labels['acll'] = '譟･謇ｾ';
 $labels['aclr'] = '隸ｻ蜿匁ｶ域�ｯ';
 $labels['acls'] = '菫晏ｭ伜ｷｲ隸ｻ迥ｶ諤�';
-$labels['aclw'] = 'Write flags';
+$labels['aclw'] = '蜀吝�･譬�蠢�';
 $labels['acli'] = '謠貞�･(螟榊宛閾ｳ)';
 $labels['aclp'] = '蜿鷹��';
 $labels['aclc'] = '蛻帛ｻｺ蟄先枚莉ｶ螟ｹ';
@@ -41,15 +41,15 @@ $labels['aclx'] = '蛻�髯､譁�莉ｶ螟ｹ';
 $labels['acla'] = '邂｡逅�';
 
 $labels['aclfull'] = '蜈ｨ驛ｨ謗ｧ蛻ｶ';
-$labels['aclother'] = '蜈ｶ莉�';
-$labels['aclread'] = '髦�隸ｻ';
-$labels['aclwrite'] = '謦ｰ蜀�';
+$labels['aclother'] = '蜈ｶ螳�';
+$labels['aclread'] = '隸ｻ蜿�';
+$labels['aclwrite'] = '蜀吝�･';
 $labels['acldelete'] = '蛻�髯､';
 
 $labels['shortacll'] = '譟･謇ｾ';
-$labels['shortaclr'] = '髦�隸ｻ';
-$labels['shortacls'] = '菫晉蕗';
-$labels['shortaclw'] = '謦ｰ蜀�';
+$labels['shortaclr'] = '隸ｻ蜿�';
+$labels['shortacls'] = '菫晏ｭ�';
+$labels['shortaclw'] = '蜀吝�･';
 $labels['shortacli'] = '謠貞�･';
 $labels['shortaclp'] = '蜿鷹��';
 $labels['shortaclc'] = '譁ｰ蟒ｺ';
@@ -61,22 +61,22 @@ $labels['shortaclx'] = '蛻�髯､譁�莉ｶ螟ｹ';
 $labels['shortacla'] = '邂｡逅�';
 
 $labels['shortaclother'] = '蜈ｶ莉�';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = '謦ｰ蜀�';
+$labels['shortaclread'] = '隸ｻ蜿�';
+$labels['shortaclwrite'] = '蜀吝�･';
 $labels['shortacldelete'] = '蛻�髯､';
 
 $labels['longacll'] = '隸･譁�莉ｶ螟ｹ蝨ｨ蛻苓｡ｨ荳雁庄隗∽ｸ泌庄陲ｫ隶｢髦�';
 $labels['longaclr'] = '隸･譁�莉ｶ螟ｹ蜿ｯ陲ｫ謇灘ｼ�髦�隸ｻ';
 $labels['longacls'] = 'Messages Seen flag can be changed';
 $labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = 'Messages can be written or copied to the folder';
+$labels['longacli'] = '豸域�ｯ蜿ｯ蜀呎�門庄陲ｫ螟榊宛閾ｳ譁�莉ｶ螟ｹ荳ｭ';
 $labels['longaclp'] = 'Messages can be posted to this folder';
 $labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
 $labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
 $labels['longacld'] = 'Messages Delete flag can be changed';
 $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = '豸域�ｯ蜿ｯ陲ｫ貂�髯､';
-$labels['longaclx'] = '隸･譁�莉ｶ螟ｹ蜿ｯ謔ｲ蛻�髯､謌夜�榊多蜷�';
+$labels['longaclx'] = '隸･譁�莉ｶ螟ｹ蜿ｯ陲ｫ蛻�髯､謌夜�榊多蜷�';
 $labels['longacla'] = '譁�莉ｶ螟ｹ隶ｿ髣ｮ譚�髯仙庄陲ｫ菫ｮ謾ｹ';
 
 $labels['longaclfull'] = 'Full control including folder administration';
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
index 3125c286f..821f7b321 100644
--- a/plugins/acl/localization/zh_TW.inc
+++ b/plugins/acl/localization/zh_TW.inc
@@ -65,10 +65,10 @@ $labels['shortaclread'] = '隶�蜿�';
 $labels['shortaclwrite'] = '蟇ｫ蜈･';
 $labels['shortacldelete'] = '蛻ｪ髯､';
 
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longacll'] = '豁､雉�譁吝､ｾ谺企剞蜿ｯ莉･險る務蜥檎�剰ｦｽ';
 $labels['longaclr'] = '雉�譁吝､ｾ閭ｽ陲ｫ謇馴幕闊�隶�蜿�';
 $labels['longacls'] = '閭ｽ菫ｮ謾ｹ險頑�ｯ讓吝ｹ�';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
+$labels['longaclw'] = '蜈ｧ螳ｹ譌玲ｨ吝柱髣憺嵯蟄怜庄莉･隶頑峩,荳榊桁蜷ｫ蟾ｲ讙｢隕門柱蛻ｪ髯､逧�';
 $labels['longacli'] = '險頑�ｯ閭ｽ蟇ｫ蜈･謌冶､�陬ｽ蛻ｰ雉�譁吝､ｾ';
 $labels['longaclp'] = '險頑�ｯ閭ｽ陲ｫ謚暮◇蛻ｰ騾吝�玖ｳ�譁吝､ｾ';
 $labels['longaclc'] = '騾吝�玖ｳ�譁吝､ｾ荵倶ｸ句庄莉･蟒ｺ蟄占ｳ�譁吝､ｾ(謌夜�肴眠蜻ｽ蜷搾ｼ�';
diff --git a/plugins/archive/localization/az_AZ.inc b/plugins/archive/localization/az_AZ.inc
index 8aab6f2da..19a409d41 100644
--- a/plugins/archive/localization/az_AZ.inc
+++ b/plugins/archive/localization/az_AZ.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arxiv';
 $labels['buttontitle'] = 'Mesajﾄｱ arxivﾉ� gﾃｶndﾉ决';
 $labels['archived'] = 'Arxivﾉ� gﾃｶndﾉ决ildi';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Mﾃｼvﾉ冉fﾉ冫iyyﾉ冲lﾉ� arxivlﾉ卩歸irildi. Yeni arxiv qovluqlarﾄｱnﾄｱ gﾃｶrmﾉ冖 ﾃｼﾃｧﾃｼn sﾉ冑ifﾉ冢i yenilﾉ凉in.';
+$labels['archiveerror'] = 'Bﾉ凛i mﾉ冖tublar arxivlﾉ卩歸irilﾉ� bilinmirlﾉ决';
 $labels['archivefolder'] = 'Arxiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arxiv';
+$labels['archivetype'] = 'Arxivi bﾃｶl: ';
+$labels['archivetypeyear'] = 'ﾄｰl (mﾉ冱. Arxiv/2012)';
+$labels['archivetypemonth'] = 'Ay (mﾉ冱. Arxiv/2012/06)';
+$labels['archivetypefolder'] = 'Orijinal qovluq';
+$labels['archivetypesender'] = 'Gﾃｶndﾉ决ﾉ冢in E-Poﾃｧtu';
+$labels['unkownsender'] = 'namﾉ冤um';
 
 ?>
diff --git a/plugins/archive/localization/bg_BG.inc b/plugins/archive/localization/bg_BG.inc
index fd32931c2..b7be242e0 100644
--- a/plugins/archive/localization/bg_BG.inc
+++ b/plugins/archive/localization/bg_BG.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'ﾐ績�ﾑ�ﾐｸﾐｲﾐｸﾑ�ﾐｰﾐｽﾐｵ';
 $labels['buttontitle'] = 'ﾐ績�ﾑ�ﾐｸﾐｲﾐｸﾑ�ﾐｰﾐｽﾐｵ ﾐｽﾐｰ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｵﾑひｾ';
 $labels['archived'] = 'ﾐ績�ﾑ�ﾐｸﾐｲﾐｸﾑ�ﾐｰﾐｽﾐｵﾑひｾ ﾐｵ ﾑτ�ﾐｿﾐｵﾑ威ｽﾐｾ';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'ﾐ｣ﾑ�ﾐｿﾐｵﾑ威ｽﾐｾ ﾐｰﾑ�ﾑ�ﾐｸﾐｲﾐｸﾑ�ﾐｰﾐｽﾐｾ. ﾐ湲�ﾐｵﾐｷﾐｰﾑ�ﾐｵﾐｴﾐｵﾑひｵ ﾑ�ﾑび�ﾐｰﾐｽﾐｸﾑ�ﾐｰﾑひｰ ﾐｷﾐｰ ﾐｴﾐｰ ﾐｲﾐｸﾐｴﾐｸﾑひｵ ﾐｰﾑ�ﾑ�ﾐｸﾐｲﾐｸﾑ�ﾐｰﾐｽﾐｸﾑひｵ ﾐｿﾐｰﾐｿﾐｺﾐｸ.';
+$labels['archiveerror'] = 'ﾐ旃紹ｺﾐｾﾐｸ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ� ﾐｽﾐｵ ﾐｱﾑ肖�ﾐｰ ﾐｰﾑ�ﾑ�ﾐｸﾐｲﾐｸﾑ�ﾐｰﾐｽﾐｸ';
 $labels['archivefolder'] = 'ﾐ績�ﾑ�ﾐｸﾐｲﾐｸﾑ�ﾐｰﾐｽﾐｵ';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'ﾐ績�ﾑ�ﾐｸﾐｲ';
+$labels['archivetype'] = 'ﾐ�ﾐｰﾐｷﾐｴﾐｵﾐｻﾐｸ ﾐｰﾑ�ﾑ�ﾐｸﾐｲﾐｰ ﾐｿﾐｾ';
+$labels['archivetypeyear'] = 'ﾐ寅ｾﾐｴﾐｸﾐｽﾐｰ (ﾐｿﾑ�. ﾐ績�ﾑ�ﾐｸﾐｲ/2012)';
+$labels['archivetypemonth'] = 'ﾐ慴ｵﾑ�ﾐｵﾑ� (ﾐｿﾑ�. ﾐ績�ﾑ�ﾐｸﾐｲ/2012/06)';
+$labels['archivetypefolder'] = 'ﾐ樮�ﾐｸﾐｳﾐｸﾐｽﾐｰﾐｻﾐｽﾐｰ ﾐｿﾐｰﾐｿﾐｺﾐｰ';
+$labels['archivetypesender'] = 'Email ﾐｰﾐｴﾑ�ﾐｵﾑ� ﾐｽﾐｰ ﾐｸﾐｷﾐｿﾑ�ﾐｰﾑ禍ｰﾑ�ﾐｰ';
+$labels['unkownsender'] = 'ﾐｽﾐｵﾐｸﾐｷﾐｲﾐｵﾑ�ﾑひｽﾐｾ';
 
 ?>
diff --git a/plugins/archive/localization/ca_ES.inc b/plugins/archive/localization/ca_ES.inc
index fde7d358e..04ade1dbf 100644
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arxiva';
 $labels['buttontitle'] = 'Arxiva aquest missatge';
 $labels['archived'] = 'Arxivat correctament';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arxivat correctament. Recarregueu la pﾃ�gina per veure les noves carpetes de l\'arxiu.';
+$labels['archiveerror'] = 'Alguns missatges no han pogut ser arxivats';
 $labels['archivefolder'] = 'Arxiva';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arxiu';
+$labels['archivetype'] = 'Dividir arxiu per';
+$labels['archivetypeyear'] = 'Any (p.ex. Arxiu/2012)';
+$labels['archivetypemonth'] = 'Mes (p.ex. Arxiu/2012/06)';
+$labels['archivetypefolder'] = 'Carpeta original';
+$labels['archivetypesender'] = 'Adreﾃｧa del remitent';
+$labels['unkownsender'] = 'desconegut';
 
 ?>
diff --git a/plugins/archive/localization/cs_CZ.inc b/plugins/archive/localization/cs_CZ.inc
index 2f2fd95d5..e71aa5fa6 100644
--- a/plugins/archive/localization/cs_CZ.inc
+++ b/plugins/archive/localization/cs_CZ.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archiv';
 $labels['buttontitle'] = 'Archivovat zprﾃ｡vu';
 $labels['archived'] = 'ﾃ嘖pﾄ崘｡nﾄ� vloﾅｾeno do archivu';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'ﾃ嘖pﾄ崘｡nﾄ� archivovﾃ｡ny. Obnovte strﾃ｡nku, abyste uvidﾄ嬪i novﾃｩ sloﾅｾky v archivu.';
+$labels['archiveerror'] = 'Nﾄ嫐terﾃｩ zprﾃ｡vy nelze archivovat';
 $labels['archivefolder'] = 'Archiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archiv';
+$labels['archivetype'] = 'Rozdﾄ嬪it archiv podle';
+$labels['archivetypeyear'] = 'Rok (napﾅ�.  Archiv/2012)';
+$labels['archivetypemonth'] = 'Mﾄ孕ﾃｭc (napﾅ�. Archiv/2012/06)';
+$labels['archivetypefolder'] = 'Pﾅｯvodnﾃｭ sloﾅｾka';
+$labels['archivetypesender'] = 'E-mail odesﾃｭlatele';
+$labels['unkownsender'] = 'neznﾃ｡mﾃｽ';
 
 ?>
diff --git a/plugins/archive/localization/cy_GB.inc b/plugins/archive/localization/cy_GB.inc
index fa8e19756..454c26da5 100644
--- a/plugins/archive/localization/cy_GB.inc
+++ b/plugins/archive/localization/cy_GB.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archif';
 $labels['buttontitle'] = 'Archifo\'r neges hwn';
 $labels['archived'] = 'Archifwyd yn llwyddiannus';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Archifwyd yn llwyddiannus. Ail-lwythwch y dudalen i weld ffolderi archif newydd.';
+$labels['archiveerror'] = 'Nid oedd yn bosib archifo rhai negeseuon';
 $labels['archivefolder'] = 'Archif';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archif';
+$labels['archivetype'] = 'Rhannu archif gyda';
+$labels['archivetypeyear'] = 'Blwyddyn (e.g. Archif/2012)';
+$labels['archivetypemonth'] = 'Mis (e.g. Archif/2012/06)';
+$labels['archivetypefolder'] = 'Ffolder gwreiddiol';
+$labels['archivetypesender'] = 'Ebost anfonwr';
+$labels['unkownsender'] = 'anhysbys';
 
 ?>
diff --git a/plugins/archive/localization/da_DK.inc b/plugins/archive/localization/da_DK.inc
index d4a88cab4..ac67700a4 100644
--- a/plugins/archive/localization/da_DK.inc
+++ b/plugins/archive/localization/da_DK.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkivﾃｩr denne besked';
 $labels['archived'] = 'Succesfuldt arkiveret.';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arkivering lykkedes. Genindlﾃｦs siden for at se den nye arkiv mappe.';
+$labels['archiveerror'] = 'Nogle meddelelser kunne ikke arkiveres';
 $labels['archivefolder'] = 'Arkiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arkiver';
+$labels['archivetype'] = 'Del arkiv med';
+$labels['archivetypeyear'] = 'ﾃ�r (f.eks. Arkiv/2012)';
+$labels['archivetypemonth'] = 'Mﾃ･ned (f.eks. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Original mappe';
+$labels['archivetypesender'] = 'Afsenders email';
+$labels['unkownsender'] = 'ukendt';
 
 ?>
diff --git a/plugins/archive/localization/el_GR.inc b/plugins/archive/localization/el_GR.inc
index 57a98abc8..6da9f7dbf 100644
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'ﾎ耐�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｭﾏ�ﾎｷﾏπｷ';
 $labels['buttontitle'] = 'ﾎ耐�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｭﾏ�ﾎｷﾏπｷ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ�';
 $labels['archived'] = 'ﾎ耐�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｵﾏ�ﾎｮﾎｸﾎｷﾎｺﾎｵ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'ﾎ変�ﾎｹﾏ�ﾏ�ﾏ�ﾎｮﾏ� ﾎｱﾏ�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｵﾏ�ﾎｷﾏπｷ. ﾎ対ｽﾎｱﾎｽﾎｭﾏ珂πｷ ﾏ�ﾎｷﾏ� ﾏπｵﾎｻﾎｯﾎｴﾎｱﾏ� ﾎｳﾎｹﾎｱ ﾎｽﾎｱ ﾎｴﾎｵﾎｯﾏ�ﾎｵ ﾏ�ﾎｿﾏ�ﾏ� ﾎｽﾎｭﾎｿﾏ�ﾏ� ﾏ�ﾎｱﾎｺﾎｭﾎｻﾎｿﾏ�ﾏ� ﾎｱﾏ�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｭﾏ�ﾎｷﾏπｷﾏ�. ';
+$labels['archiveerror'] = 'ﾎ渮∃ｹﾏπｼﾎｭﾎｽﾎｱ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｱ ﾎｴﾎｵﾎｽ ﾎｼﾏ�ﾎｿﾏ∃ｵﾏπｱﾎｽ ﾎｽﾎｱ ﾎｱﾏ�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｵﾏ�ﾎｷﾎｸﾎｿﾏ�ﾎｽ. ';
 $labels['archivefolder'] = 'ﾎ耐�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｭﾏ�ﾎｷﾏπｷ';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'ﾎ耐�ﾏ�ﾎｵﾎｹﾎｿﾎｸﾎｭﾏ�ﾎｷﾏπｷ';
+$labels['archivetype'] = 'ﾎｧﾎｱﾏπｼﾎｱ ﾎｱﾏ�ﾏ�ﾎｵﾎｹﾎｿﾏ� ﾎｱﾏ�ﾎｿ';
+$labels['archivetypeyear'] = 'ﾎｧﾏ∃ｿﾎｽﾎｿﾏ� (ﾏ�.ﾏ�. ﾎ耐�ﾏ�ﾎｵﾎｹﾎｿ/2012)';
+$labels['archivetypemonth'] = 'ﾎ慚ｷﾎｽﾎｱﾏ� (ﾏ�.ﾏ�. ﾎ耐�ﾏ�ﾎｵﾎｹﾎｿ/2012/06)';
+$labels['archivetypefolder'] = 'ﾎ耐�ﾎｸﾎｵﾎｽﾏ�ﾎｹﾎｺﾎｿﾏ� ﾏ�ﾎｱﾎｺﾎｵﾎｻﾎｿﾏ�';
+$labels['archivetypesender'] = 'ﾎ耐�ﾎｿﾏρ�ﾎｿﾎｻﾎｭﾎｱﾏ� email';
+$labels['unkownsender'] = 'ﾎｬﾎｳﾎｽﾏ珂ρ�ﾎｿ';
 
 ?>
diff --git a/plugins/archive/localization/es_AR.inc b/plugins/archive/localization/es_AR.inc
index ad9e84add..5fb082497 100644
--- a/plugins/archive/localization/es_AR.inc
+++ b/plugins/archive/localization/es_AR.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Archivado satisfactoriamente. Recarga la pﾃ｡gina para ver las nuevas capetas archivadas.';
+$labels['archiveerror'] = 'Algunos mensajes no pudieron archivarse';
 $labels['archivefolder'] = 'Archivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archivo';
+$labels['archivetype'] = 'Separar archivo por';
+$labels['archivetypeyear'] = 'Aﾃｱo (ej. Archivo/2012)';
+$labels['archivetypemonth'] = 'Mes (ej. Archivo/2012/06)';
+$labels['archivetypefolder'] = 'Carpeta original';
+$labels['archivetypesender'] = 'Remitente del correo';
+$labels['unkownsender'] = 'desconocido';
 
 ?>
diff --git a/plugins/archive/localization/gl_ES.inc b/plugins/archive/localization/gl_ES.inc
index 09b64b2ab..55180fefe 100644
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensaxe';
 $labels['archived'] = 'Aquivouse a mensaxe';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arquivado correctamente. Recargue a pﾃ｡xina para ver os novos cartafoles de arquivado.';
+$labels['archiveerror'] = 'Non se puideron arquivar algunhas mensaxes';
 $labels['archivefolder'] = 'Arquivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arquivar';
+$labels['archivetype'] = 'Dividir o arquivo por';
+$labels['archivetypeyear'] = 'Ano (p.ex. Arquivo/2012)';
+$labels['archivetypemonth'] = 'Mes (p.ex. Arquivo/2012/06)';
+$labels['archivetypefolder'] = 'Cartafol orixe';
+$labels['archivetypesender'] = 'Enderezo do remitente';
+$labels['unkownsender'] = 'descoﾃｱecido';
 
 ?>
diff --git a/plugins/archive/localization/he_IL.inc b/plugins/archive/localization/he_IL.inc
index 834e46729..37bcaaa3f 100644
--- a/plugins/archive/localization/he_IL.inc
+++ b/plugins/archive/localization/he_IL.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'ﾗ碩ｨﾗ嶼燮勉�';
 $labels['buttontitle'] = 'ﾗ槞ｩﾗ慵勉� ﾗ蕃蕃勉沌｢ﾗ� ﾗ慵碩ｨﾗ嶼燮�';
 $labels['archived'] = 'ﾗ｢ﾗ沌嶼勉� ﾗ蕃碩ｨﾗ嶼燮勉� ﾗ蕃ｦﾗ慵燮�';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'ﾗ�ﾗｩﾗ槞ｨ ﾗ泰蕃ｦﾗ慵隣� ﾗ泰碩ｨﾗ嶼燮�. ﾗ燮ｩ ﾗ慵ｨﾗ｢ﾗ�ﾗ� ﾗ碩ｪ ﾗ蕃沌｣ ﾗ嶼沌� ﾗ慵ｨﾗ碩勉ｪ ﾗ碩ｪ ﾗ蕃ｪﾗ燮ｧﾗ燮勉ｪ ﾗ蕃隣沌ｩﾗ勉ｪ ﾗ泰碩ｨﾗ嶼燮�.';
+$labels['archiveerror'] = 'ﾗ慵� ﾗ�ﾗ燮ｪﾗ� ﾗ蕃燮� ﾗ慵蕃｢ﾗ泰燮ｨ ﾗ慵碩ｨﾗ嶼燮� ﾗ隣慵ｧ ﾗ槞蕃蕃勉沌｢ﾗ勉ｪ';
 $labels['archivefolder'] = 'ﾗ碩ｨﾗ嶼燮勉�';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'ﾗ碩ｨﾗ嶼燮�';
+$labels['archivetype'] = 'ﾗ慵隣慵ｧ ﾗ碩ｪ ﾗ蕃碩ｨﾗ嶼燮� ﾗ｢ﾗ� ﾗ燮沌�';
+$labels['archivetypeyear'] = 'ﾗｩﾗ�ﾗ� ( ﾗ慵沌勉潰槞�, ﾗ碩ｨﾗ嶼燮�/2012/96 )';
+$labels['archivetypemonth'] = 'ﾗ隣勉沌ｩ ( ﾗ慵沌勉潰槞�, ﾗ碩ｨﾗ嶼燮�/2012/96 )';
+$labels['archivetypefolder'] = 'ﾗｪﾗ燮ｧﾗ燮� ﾗ槞ｧﾗ勉ｨﾗ燮ｪ';
+$labels['archivetypesender'] = 'ﾗｩﾗ勉慵� ﾗ蕃蕃勉沌｢ﾗ�';
+$labels['unkownsender'] = 'ﾗ慵� ﾗ燮沌勉｢';
 
 ?>
diff --git a/plugins/archive/localization/hu_HU.inc b/plugins/archive/localization/hu_HU.inc
index e95c2d0d2..970a24184 100644
--- a/plugins/archive/localization/hu_HU.inc
+++ b/plugins/archive/localization/hu_HU.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archivﾃ｡lﾃ｡s';
 $labels['buttontitle'] = 'ﾃ忝enet archivﾃ｡lﾃ｡sa';
 $labels['archived'] = 'Sikeres archivﾃ｡lﾃ｡s';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Az arhivﾃ｡lﾃ｡s sikeres. Frissitsd az oldalt, hogy lﾃ｡sd a lﾃｩtrejﾃｶtt arhivum mappﾃ｡kat.';
+$labels['archiveerror'] = 'Nﾃｩhﾃ｡ny ﾃｼzenetet nem sikerﾃｼlt arhivﾃ｡lni';
 $labels['archivefolder'] = 'Archivﾃ｡lﾃ｡s';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
+$labels['settingstitle'] = 'Archivﾃ｡lﾃ｡s';
+$labels['archivetype'] = 'Arhﾃｭvum tovﾃ｡bb bontﾃ｡sa a kﾃｶvetkezﾅ� szerint';
+$labels['archivetypeyear'] = 'ﾃ益 ( pl Arhﾃｭvum/2012)';
+$labels['archivetypemonth'] = 'Honap ( pl Arhﾃｭvum/2012/06)';
+$labels['archivetypefolder'] = 'Eredeti mappa';
+$labels['archivetypesender'] = 'Feladﾃｳ';
 $labels['unkownsender'] = 'ismeretlen';
 
 ?>
diff --git a/plugins/archive/localization/ko_KR.inc b/plugins/archive/localization/ko_KR.inc
index 96a7ac404..4226420a0 100644
--- a/plugins/archive/localization/ko_KR.inc
+++ b/plugins/archive/localization/ko_KR.inc
@@ -19,16 +19,16 @@
 $labels = array();
 $labels['buttontext'] = '�ｳｴ�ｴ�';
 $labels['buttontitle'] = '�擽 �ｩ肥亨�ｧ��･ｼ �ｳｴ�ｴ�';
-$labels['archived'] = '�┳�ｳｵ����愍�｡� �ｳｴ�ｴ� �勢';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archived'] = '�┳�ｳｵ����愍�｡� �ｳｴ�ｴ��勢';
+$labels['archivedreload'] = '�┳�ｳｵ����愍�｡� �ｳｴ�ｴ��勢. �侍�擽�ｧ��･ｼ �共�亨 �ｶ壱洳�凰��� �ヨ �ｳｴ�ｴ� �抄�鵠�･ｼ �剳�攤�葺�┷�囈.';
+$labels['archiveerror'] = '�攵�ｶ� �ｩ肥亨�ｧ��ｰ� �ｳｴ�ｴ��据�ｧ� �賦�搆';
 $labels['archivefolder'] = '�ｳｴ�ｴ�';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = '�ｳｴ�ｴ�';
+$labels['archivetype'] = '�ｳｴ�ｴ��頗 �ｩ肥亨�ｧ� ��簿ｦｬ �ｸｰ�､�';
+$labels['archivetypeyear'] = '�硫�巡 (���: �ｳｴ�ｴ� �失�ｧ��物/2012)';
+$labels['archivetypemonth'] = '�對 (���: �ｳｴ�ｴ� �失�ｧ��物/2012/06)';
+$labels['archivetypefolder'] = '�寳�ｳｸ �抄�鵠';
+$labels['archivetypesender'] = '�ｰ懍侠�攤 �擽�ｩ肥攵';
+$labels['unkownsender'] = '�阜 ��� �螺�搆';
 
 ?>
diff --git a/plugins/archive/localization/lt_LT.inc b/plugins/archive/localization/lt_LT.inc
index 36046277a..069a65665 100644
--- a/plugins/archive/localization/lt_LT.inc
+++ b/plugins/archive/localization/lt_LT.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archyvuoti';
 $labels['buttontitle'] = 'Perkelti ﾅ｡ﾄｯ laiﾅ｡kﾄ� ﾄｯ archyvﾄ�';
 $labels['archived'] = 'Laiﾅ｡kas sﾄ楊mingai perkeltas ﾄｯ archyvﾄ�';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Sﾄ楊mingai perkelta ﾄｯ archyvﾄ�. Iﾅ｡ naujo ﾄｯkelkite puslapﾄｯ, kad pamatytumﾄ葉 pasikeitimus.';
+$labels['archiveerror'] = 'ﾄｮ archyvﾄ� nepavyko perkelti keleto laiﾅ｡kﾅｳ.';
 $labels['archivefolder'] = 'Archyvuoti';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archyvuoti';
+$labels['archivetype'] = 'Padalinti archyvﾄ� pagal';
+$labels['archivetypeyear'] = 'Metai (pvz. Archyvas/2012)';
+$labels['archivetypemonth'] = 'Mﾄ溶esis (pvz. Archyvas/2012/06)';
+$labels['archivetypefolder'] = 'Tikrasis aplankas';
+$labels['archivetypesender'] = 'Siuntﾄ曜o el. paﾅ｡to adresas';
+$labels['unkownsender'] = 'neﾅｾinomas';
 
 ?>
diff --git a/plugins/archive/localization/pt_BR.inc b/plugins/archive/localization/pt_BR.inc
index 6439780cb..3df6cfdad 100644
--- a/plugins/archive/localization/pt_BR.inc
+++ b/plugins/archive/localization/pt_BR.inc
@@ -20,13 +20,13 @@ $labels = array();
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archivedreload'] = 'Arquivado com sucesso. Recarregue a pﾃ｡gina para ver as novas pastas de arquivo.';
 $labels['archiveerror'] = 'Algumas mensagens nﾃ｣o puderam ser arquivadas';
 $labels['archivefolder'] = 'Arquivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['settingstitle'] = 'Arquivo';
+$labels['archivetype'] = 'Dividir arquivo por';
+$labels['archivetypeyear'] = 'Ano (isto ﾃｩ, Arquivo/2012)';
+$labels['archivetypemonth'] = 'Mﾃｪs (isto ﾃｩ, Arquivo/2012/06)';
 $labels['archivetypefolder'] = 'Pasta original';
 $labels['archivetypesender'] = 'E-mail do remetente';
 $labels['unkownsender'] = 'desconhecido';
diff --git a/plugins/archive/localization/sl_SI.inc b/plugins/archive/localization/sl_SI.inc
index 94d1f68b1..b49fe93ab 100644
--- a/plugins/archive/localization/sl_SI.inc
+++ b/plugins/archive/localization/sl_SI.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arhiv';
 $labels['buttontitle'] = 'Arhiviraj to sporoﾄ絞lo';
 $labels['archived'] = 'Sporoﾄ絞lo je bilo uspeﾅ｡no arhivirano';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Uspeﾅ｡no  shranjeno v arhiv. Za pregled map v Arhivu ponovno naloﾅｾite stran.';
+$labels['archiveerror'] = 'Nekaterih sporoﾄ絞l ni bilo mogoﾄ稿 arhivirati';
 $labels['archivefolder'] = 'Arhiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arhiv';
+$labels['archivetype'] = 'Razdeli arhiv glede na';
+$labels['archivetypeyear'] = 'Leto (npr. Arhiv/2012)';
+$labels['archivetypemonth'] = 'Mesec (npr. Arhiv/2012/06)';
+$labels['archivetypefolder'] = 'Izvorna mapa';
+$labels['archivetypesender'] = 'Naslov poﾅ｡iljatelja';
+$labels['unkownsender'] = 'neznan';
 
 ?>
diff --git a/plugins/archive/localization/tr_TR.inc b/plugins/archive/localization/tr_TR.inc
index 765498301..b6960ea89 100644
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arﾅ殃v';
 $labels['buttontitle'] = 'Bu postayﾄｱ arﾅ殃vle';
 $labels['archived'] = 'Baﾅ歛rﾄｱyla arﾅ殃vlendi';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Baﾅ歛rﾄｱyla arﾅ殃vlendi. Yeni arﾅ殃v dosyalarﾄｱnﾄｱ gﾃｶrmek iﾃｧin sayfayﾄｱ yenileyin.';
+$labels['archiveerror'] = 'Bazﾄｱ mesajlar arﾅ殃vlenemedi.';
 $labels['archivefolder'] = 'Arﾅ殃v';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arﾅ殃v';
+$labels['archivetype'] = 'Arﾅ殃vi bunla bﾃｶl';
+$labels['archivetypeyear'] = 'Yﾄｱl (Arﾅ殃v/2012)';
+$labels['archivetypemonth'] = 'Ay(Arﾅ殃v/2012/06)';
+$labels['archivetypefolder'] = 'ﾃ奔gﾃｼn dosya';
+$labels['archivetypesender'] = 'E-Posta Gﾃｶndericisi';
+$labels['unkownsender'] = 'bilinmeyen';
 
 ?>
diff --git a/plugins/archive/localization/zh_CN.inc b/plugins/archive/localization/zh_CN.inc
index f0e2d4236..4a13d541a 100644
--- a/plugins/archive/localization/zh_CN.inc
+++ b/plugins/archive/localization/zh_CN.inc
@@ -18,13 +18,13 @@
 
 $labels = array();
 $labels['buttontext'] = '蟄俶｡｣';
-$labels['buttontitle'] = '蟆�隸･菫｡諱ｯ蟄俶｡｣';
+$labels['buttontitle'] = '蟄俶｡｣隸･菫｡諱ｯ';
 $labels['archived'] = '蟄俶｡｣謌仙粥';
-$labels['archivedreload'] = '蟄俶｡｣謌仙粥縲ょ姐譁ｰ譛ｬ鬘ｵ譚･譟･逵区眠逧�蟄俶｡｣譁�莉ｶ螟ｹ縲�';
+$labels['archivedreload'] = '蟄俶｡｣謌仙粥縲りｯｷ蛻ｷ譁ｰ譛ｬ鬘ｵ莉･譟･逵区眠逧�蟄俶｡｣譁�莉ｶ螟ｹ縲�';
 $labels['archiveerror'] = '驛ｨ蛻�菫｡諱ｯ譌�豕募ｭ俶｡｣';
 $labels['archivefolder'] = '蟄俶｡｣';
 $labels['settingstitle'] = '蟄俶｡｣';
-$labels['archivetype'] = 'Divide archive by';
+$labels['archivetype'] = '蛻�邀ｻ蟄俶｡｣謖�';
 $labels['archivetypeyear'] = '蟷ｴ(萓句ｦ� 蟄俶｡｣/2012)';
 $labels['archivetypemonth'] = '譛�(萓句ｦ� 蟄俶｡｣/2012/06)';
 $labels['archivetypefolder'] = '蜴溷ｧ区枚莉ｶ螟ｹ';
diff --git a/plugins/archive/localization/zh_TW.inc b/plugins/archive/localization/zh_TW.inc
index a434f3184..6eac3a391 100644
--- a/plugins/archive/localization/zh_TW.inc
+++ b/plugins/archive/localization/zh_TW.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = '蟆∝ｭ�';
 $labels['buttontitle'] = '蟆∝ｭ俶ｭ､菫｡莉ｶ';
 $labels['archived'] = '蟾ｲ謌仙粥蟆∝ｭ�';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = '蟆∝ｭ伜虚菴懷ｮ梧��.驥肴眠霈牙�･鬆�髱｢轢剰ｦｽ譁ｰ逧�蟆∝ｭ倩ｳ�譁吝､ｾ';
+$labels['archiveerror'] = '驛ｨ蛻�雉�險顔┌豕募ｮ梧�仙ｰ∝ｭ�';
 $labels['archivefolder'] = '蟆∝ｭ�';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = '蟆∝ｭ�';
+$labels['archivetype'] = '蟆∝ｭ俶ｪ疲｡亥��蜑ｲ譁ｹ蠑�';
+$labels['archivetypeyear'] = '蟷ｴ蛻�(萓句ｦ�: 蟆∝ｭ�/2012)';
+$labels['archivetypemonth'] = '譛井ｻｽ(萓句ｦ�: 蟆∝ｭ�/2012/06)';
+$labels['archivetypefolder'] = '蜴溷ｧ玖ｳ�譁吝､ｾ';
+$labels['archivetypesender'] = '蟇�莉ｶ閠�髮ｻ蟄蝉ｿ｡邂ｱ';
+$labels['unkownsender'] = '譛ｪ遏･';
 
 ?>
diff --git a/plugins/help/localization/ko_KR.inc b/plugins/help/localization/ko_KR.inc
index a589d0ce1..836da6639 100644
--- a/plugins/help/localization/ko_KR.inc
+++ b/plugins/help/localization/ko_KR.inc
@@ -19,6 +19,6 @@
 $labels = array();
 $labels['help'] = '�巡�它�ｧ�';
 $labels['about'] = '��簿ｳｴ';
-$labels['license'] = '�攵�擽�┥�侃';
+$labels['license'] = '�攵�擽�│�侃';
 
 ?>
diff --git a/plugins/help/localization/zh_CN.inc b/plugins/help/localization/zh_CN.inc
index 5d6272eea..59719477b 100644
--- a/plugins/help/localization/zh_CN.inc
+++ b/plugins/help/localization/zh_CN.inc
@@ -19,6 +19,6 @@
 $labels = array();
 $labels['help'] = '蟶ｮ蜉ｩ';
 $labels['about'] = '蜈ｳ莠�';
-$labels['license'] = '隶ｸ蜿ｯ蜊剰ｮｮ';
+$labels['license'] = '謗域揀菫｡諱ｯ';
 
 ?>
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index 35ca87110..f272df7b0 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Gﾃｶndﾉ决ﾉ冢';
 $labels['recipient'] = 'Qﾉ冀ul edﾉ冢';
 $labels['vacationaddresses'] = 'ﾆ粛avﾉ� ﾃｼnvanlarﾄｱm ﾃｼﾃｧﾃｼn siyahﾄｱ (vergﾃｼllﾉ决 ilﾉ� ayrﾄｱlmﾄｱﾅ�):';
 $labels['vacationdays'] = 'Mﾉ冖tub neﾃｧﾉ� mﾃｼddﾉ冲dﾉ冢 bir gﾃｶndﾉ决ilsin (gﾃｼndﾉ�):';
+$labels['vacationinterval'] = 'Mﾉ冖tublar nﾉ� qﾉ囘ﾉ决 sﾄｱx gﾃｶndﾉ决ilsin:';
+$labels['days'] = 'gﾃｼnlﾉ决';
+$labels['seconds'] = 'saniyﾉ冤ﾉ决';
 $labels['vacationreason'] = 'Mﾉ冖tubun mﾉ冲ni (sﾉ冀ﾉ冀 yoxdur):';
 $labels['vacationsubject'] = 'Mﾉ冖tubun mﾃｶvzusu:';
 $labels['rulestop'] = 'Yerinﾉ� yetirmﾉ凉i dayandﾄｱr';
@@ -95,9 +98,9 @@ $labels['flagdeleted'] = 'Silindi';
 $labels['flaganswered'] = 'Cavab verilmiﾅ�';
 $labels['flagflagged'] = 'ﾄｰﾅ歛rﾉ冤ilﾉ决';
 $labels['flagdraft'] = 'Qaralama';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
+$labels['setvariable'] = 'Dﾉ凉iﾅ淤冢i tﾉ凉in et';
+$labels['setvarname'] = 'Dﾉ凉iﾅ淤冢in adﾄｱ:';
+$labels['setvarvalue'] = 'Dﾉ凉iﾅ淤冢in dﾉ凉ﾉ决i:';
 $labels['setvarmodifiers'] = 'Modifikatorlar';
 $labels['varlower'] = 'aﾅ歛ﾄ淨ｱ registr';
 $labels['varupper'] = 'yuxarﾄｱ registr';
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index 47719e85e..64f81599e 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'ﾐ籍ｴ ﾐｺﾐｰﾐｳﾐｾ';
 $labels['recipient'] = 'ﾐ墟ｰﾐｼﾑ�';
 $labels['vacationaddresses'] = 'ﾐ頒ｰﾐｴﾐｰﾑひｺﾐｾﾐｲﾑ� ﾑ�ﾐｿﾑ毛� ﾐｰﾑび�ﾑ巾ｼﾐｰﾐｻﾑ糊ｽﾑ孟ｺﾐｰﾑ� (ﾐｿﾑ�ﾐｰﾐｷ ﾐｺﾐｾﾑ�ﾐｺﾑ�):';
 $labels['vacationdays'] = 'ﾐｯﾐｺ ﾑ�ﾐｰﾑ�ﾑひｰ ﾐｴﾐｰﾑ�ﾑ巾ｻﾐｰﾑ�ﾑ� ﾐｿﾐｰﾐｲﾐｵﾐｴﾐｰﾐｼﾐｻﾐｵﾐｽﾐｽﾑ� (ﾑ� ﾐｴﾐｽﾑ肖�):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index f718e3d39..28f2ddb99 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'ﾐ渙ｾﾐｴﾐｰﾑひｵﾐｻ';
 $labels['recipient'] = 'ﾐ渙ｾﾐｻﾑτ�ﾐｰﾑひｵﾐｻ';
 $labels['vacationaddresses'] = 'ﾐ頒ｾﾐｿﾑ諌ｻﾐｽﾐｸﾑひｵﾐｻﾐｽﾐｸ e-mail ﾐｰﾐｴﾑ�ﾐｵﾑ�ﾐｸ (ﾑ�ﾐｰﾐｷﾐｴﾐｵﾐｻﾐｵﾐｽﾐｸ ﾑ�ﾑ貫� ﾐｷﾐｰﾐｿﾐｵﾑひｰﾑ�):';
 $labels['vacationdays'] = 'ﾐ墟ｾﾐｻﾐｺﾐｾ ﾑ�ﾐｵﾑ�ﾑひｾ ﾐｿﾑ�ﾐｰﾑ禍ｰﾑひｵ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ� (ﾐｲ ﾐｴﾐｽﾐｸ):';
+$labels['vacationinterval'] = 'ﾐ墟ｾﾐｻﾐｺﾐｾ ﾑ�ﾐｵﾑ�ﾑひｾ ﾐｴﾐｰ ﾐｿﾑ�ﾐｰﾑ禍ｰ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ�:';
+$labels['days'] = 'ﾐｴﾐｽﾐｸ';
+$labels['seconds'] = 'ﾑ�ﾐｵﾐｺﾑσｽﾐｴﾐｸ';
 $labels['vacationreason'] = 'ﾐ｢ﾐｵﾐｺﾑ�ﾑ� ﾐｽﾐｰ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｵﾑひｾ (ﾐｿﾑ�ﾐｸﾑ�ﾐｸﾐｽﾐｰ ﾐｷﾐｰ ﾐｲﾐｰﾐｺﾐｰﾐｽﾑ�ﾐｸﾑ肖ひｰ)';
 $labels['vacationsubject'] = 'ﾐ｢ﾐｵﾐｼﾐｰ ﾐｽﾐｰ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｵﾑひｾ';
 $labels['rulestop'] = 'ﾐ湲�ﾐｰﾐｲﾐｸﾐｻﾐｰ ﾐｷﾐｰ ﾑ�ﾐｿﾐｸﾑ�ﾐｰﾐｽﾐｵ';
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index e12886f58..7d21dbd9f 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Poﾅ｡iljaoc';
 $labels['recipient'] = 'Primaoc';
 $labels['vacationaddresses'] = 'Moje dodatne email adrese (odvojite zarezima):';
 $labels['vacationdays'] = 'Frekvencija slanja poruka (u danima):';
+$labels['vacationinterval'] = 'Frekvencija slanja poruka:';
+$labels['days'] = 'dana';
+$labels['seconds'] = 'sekundi';
 $labels['vacationreason'] = 'Tijelo poruke (razlog za odmor):';
 $labels['vacationsubject'] = 'Naslov poruke:';
 $labels['rulestop'] = 'Prestani procjenjivati pravila';
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index 2320dfe14..e721fcce3 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari/a';
 $labels['vacationaddresses'] = 'Altres adreces electrﾃｲniques meves (separades per coma)';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
+$labels['vacationinterval'] = 'Amb quina freqﾃｼﾃｨncia enviar missatges:';
+$labels['days'] = 'dies';
+$labels['seconds'] = 'segons';
 $labels['vacationreason'] = 'Cos del missatge (raﾃｳ de les vacances):';
 $labels['vacationsubject'] = 'Assumpte del missatge:';
 $labels['rulestop'] = 'Deixa d\'avaluar regles';
@@ -95,25 +98,25 @@ $labels['flagdeleted'] = 'Suprimit';
 $labels['flaganswered'] = 'Respost';
 $labels['flagflagged'] = 'Marcat';
 $labels['flagdraft'] = 'Esborrany';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
+$labels['setvariable'] = 'Ajusta la variable';
+$labels['setvarname'] = 'Nom de la variable:';
+$labels['setvarvalue'] = 'Valor de la variable:';
+$labels['setvarmodifiers'] = 'Modificadors:';
+$labels['varlower'] = 'minﾃｺscules';
+$labels['varupper'] = 'majﾃｺscules';
+$labels['varlowerfirst'] = 'el primer carﾃ�cter ﾃｩs minﾃｺscul';
+$labels['varupperfirst'] = 'el primer carﾃ�cter ﾃｩs majﾃｺscul';
+$labels['varquotewildcard'] = 'engloba els carﾃ�cters especials amb cometes';
+$labels['varlength'] = 'llargada';
+$labels['notify'] = 'Envia notificaciﾃｳ';
+$labels['notifyaddress'] = 'Per a adreﾃｧa de correu electrﾃｲnic:';
+$labels['notifybody'] = 'Cos de la notificaciﾃｳ';
+$labels['notifysubject'] = 'Tema de la notificaciﾃｳ:';
+$labels['notifyfrom'] = 'Remitent de la notificaciﾃｳ:';
+$labels['notifyimportance'] = 'Importﾃ�nica:';
+$labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
+$labels['notifyimportancehigh'] = 'alta';
 $labels['filtercreate'] = 'Crea filtre';
 $labels['usedata'] = 'Fes servir les segﾃｼents dades al filtre:';
 $labels['nextstep'] = 'Segﾃｼent pas';
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index 0d7dfb2fb..26baeff2b 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -55,8 +55,11 @@ $labels['add'] = 'Pﾅ冓dej';
 $labels['del'] = 'Smaﾅｾ';
 $labels['sender'] = 'Odesﾃｭlatel';
 $labels['recipient'] = 'Pﾅ凖ｭjemce';
-$labels['vacationaddresses'] = 'Seznam pﾅ凖ｭjemcﾅｯ, kterﾃｽm nebude zprﾃ｡va odeslﾃ｡na (oddﾄ嬪enﾃｩ ﾄ催｡rkou):';
+$labels['vacationaddresses'] = 'Moje dalﾅ｡ﾃｭ e-mailovﾃｩ adresy (aliasy) spojenﾃｩ s tﾃｭmto ﾃｺﾄ衡em (oddﾄ嬪enﾃｩ ﾄ催｡rkou):';
 $labels['vacationdays'] = 'Poﾄ稿t dnﾅｯ mezi automatickﾃｽmi odpovﾄ崙塾i:';
+$labels['vacationinterval'] = 'Prodleva mezi automatickﾃｽmi odpovﾄ崙塾i:';
+$labels['days'] = 'dnﾅｯ';
+$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Zprﾃ｡va (Dﾅｯvod nepﾅ凖ｭtomnosti):';
 $labels['vacationsubject'] = 'Pﾅ册dmﾄ孚 zprﾃ｡vy:';
 $labels['rulestop'] = 'Zastavit pravidla';
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index 81f2ca216..52fafe770 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Anfonwr';
 $labels['recipient'] = 'Derbynnwr';
 $labels['vacationaddresses'] = 'Fy chyfeiriadau ebost ychwanegol (gwahanir gyda coma):';
 $labels['vacationdays'] = 'Pa mor aml i ddanfon negeseuon (mewn dyddiau):';
+$labels['vacationinterval'] = 'Pa mor aml i ddanfon negeseuon:';
+$labels['days'] = 'dyddiau';
+$labels['seconds'] = 'eiliadau';
 $labels['vacationreason'] = 'Corff neges (rheswm ar wyliau):';
 $labels['vacationsubject'] = 'Pwnc neges:';
 $labels['rulestop'] = 'Stopio gwerthuso rheolau';
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index 02aaa1b0e..cd3deaf40 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Afsender';
 $labels['recipient'] = 'Modtager';
 $labels['vacationaddresses'] = 'Mine alternative e-mailadresser (kommasepareret):';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
+$labels['vacationinterval'] = 'Hvor tit skal besked sendes:';
+$labels['days'] = 'dage';
+$labels['seconds'] = 'sekunder';
 $labels['vacationreason'] = 'Besked (ved ferie):';
 $labels['vacationsubject'] = 'Besked emne:';
 $labels['rulestop'] = 'Stop behandling af regler';
@@ -95,22 +98,22 @@ $labels['flagdeleted'] = 'Slettede';
 $labels['flaganswered'] = 'Besvaret';
 $labels['flagflagged'] = 'Markeret';
 $labels['flagdraft'] = 'Kladde';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
+$labels['setvariable'] = 'Skriv variablen';
+$labels['setvarname'] = 'Variabel navn:';
+$labels['setvarvalue'] = 'Variabel vﾃｦrdi:';
+$labels['setvarmodifiers'] = 'Modifikator';
+$labels['varlower'] = 'smﾃ･ bogstaver';
+$labels['varupper'] = 'store bogstaver';
+$labels['varlowerfirst'] = 'fﾃｸrste bogstav lille';
+$labels['varupperfirst'] = 'Fﾃｸrste bogstav stort';
+$labels['varquotewildcard'] = 'Sﾃｦt specialle tegn i citationstegn ';
 $labels['varlength'] = 'lﾃｦngde';
-$labels['notify'] = 'Send notification';
+$labels['notify'] = 'Send meddelelse';
 $labels['notifyaddress'] = 'Til e-mail adresse:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
+$labels['notifybody'] = 'meddelelses indhold:';
+$labels['notifysubject'] = 'Meddelelses emne:';
+$labels['notifyfrom'] = 'Meddelelses afsender:';
+$labels['notifyimportance'] = 'Vigtighed:';
 $labels['notifyimportancelow'] = 'lav';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'hﾃｸj';
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index 207475896..b30625fe9 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfﾃ､nger';
 $labels['vacationaddresses'] = 'Zusﾃ､tzliche Liste von Empfﾃ､ngern (Komma getrennt):';
 $labels['vacationdays'] = 'Antwort wird erneut gesendet nach (in Tagen):';
+$labels['vacationinterval'] = 'Wie oft senden:';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Inhalt der Nachricht (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Betreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index 6bd9046b2..d0cba28db 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfﾃ､nger';
 $labels['vacationaddresses'] = 'Zusﾃ､tzliche Liste von E-Mail Empfﾃ､ngern (Komma getrennt):';
 $labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
+$labels['vacationinterval'] = 'Wie oft sollen Nachrichten gesendet werden:';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Nachrichteninhalt (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Nachrichtenbetreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index 8504f7747..5ef9916ad 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -34,18 +34,18 @@ $labels['filteris'] = 'ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｯﾏπｿ ﾎｼﾎｵ';
 $labels['filterisnot'] = 'ﾎｴﾎｵﾎｽ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｯﾏπｿ ﾎｼﾎｵ';
 $labels['filterexists'] = 'ﾏ�ﾏ�ﾎｬﾏ�ﾏ�ﾎｵﾎｹ';
 $labels['filternotexists'] = 'ﾎｴﾎｵﾎｽ ﾏ�ﾏ�ﾎｬﾏ�ﾏ�ﾎｵﾎｹ';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
+$labels['filtermatches'] = 'ﾏ�ﾎｱﾎｹﾏ∃ｹﾎｬﾎｶﾎｵﾎｹ ﾎｼﾎｵ ﾏ�ﾎｷﾎｽ ﾎｭﾎｺﾏ�ﾏ∃ｱﾏπｷ ';
+$labels['filternotmatches'] = 'ﾎ釆ｵﾎｽ ﾏ�ﾎｱﾎｹﾏ∃ｹﾎｬﾎｶﾎｵﾎｹ ﾎｼﾎｵ ﾏ�ﾎｷﾎｽ ﾎｭﾎｺﾏ�ﾏ∃ｱﾏπｷ';
+$labels['filterregex'] = 'ﾏ�ﾎｱﾎｹﾏ∃ｹﾎｬﾎｶﾎｵﾎｹ ﾎｼﾎｵ ﾎｺﾎｱﾎｽﾎｿﾎｽﾎｹﾎｺﾎｮ ﾎｭﾎｺﾏ�ﾏ∃ｱﾏπｷ';
+$labels['filternotregex'] = 'ﾎｴﾎｵﾎｽ ﾏ�ﾎｱﾎｹﾏ∃ｹﾎｬﾎｶﾎｵﾎｹ ﾎｼﾎｵ ﾎｺﾎｱﾎｽﾎｿﾎｽﾎｹﾎｺﾎｮ ﾎｭﾎｺﾏ�ﾏ∃ｱﾏπｷ';
 $labels['filterunder'] = 'ﾎｺﾎｬﾏ�ﾏ�';
 $labels['filterover'] = 'ﾏ�ﾎｬﾎｽﾏ�';
 $labels['addrule'] = 'ﾎ�ﾏ∃ｿﾏπｸﾎｮﾎｺﾎｷ ﾎｺﾎｱﾎｽﾏ湖ｽﾎｱ';
 $labels['delrule'] = 'ﾎ釆ｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮ ﾎｺﾎｱﾎｽﾏ湖ｽﾎｱ';
 $labels['messagemoveto'] = 'ﾎ慚ｵﾏ�ﾎｱﾎｺﾎｯﾎｽﾎｷﾏπｷ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ� ﾏρ�ﾎｿ';
 $labels['messageredirect'] = 'ﾎ�ﾏ∃ｿﾏ斜ｸﾎｷﾏπｷ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ� ﾏρ�ﾎｿ';
-$labels['messagecopyto'] = 'Copy message to';
-$labels['messagesendcopy'] = 'Send message copy to';
+$labels['messagecopyto'] = 'ﾎ対ｽﾏ�ﾎｹﾎｳﾏ∃ｱﾏ�ﾎｷ ﾎｼﾏ�ﾎｽﾎｷﾎｼﾎｱﾏ�ﾎｿﾏ� ﾏπｵ';
+$labels['messagesendcopy'] = 'ﾎ耐�ﾎｿﾏρ�ﾎｿﾎｻﾎｷ ﾏ�ﾎｷﾏ� ﾎｱﾎｽﾏ�ﾎｹﾎｳﾏ∃ｱﾏ�ﾎｷﾏ� ﾎｼﾏ�ﾎｽﾎｷﾎｼﾎｱﾏ�ﾎｿﾏ� ﾏπｵ';
 $labels['messagereply'] = 'ﾎ耐�ﾎｬﾎｽﾏ�ﾎｷﾏπｷ ﾎｼﾎｵ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ';
 $labels['messagedelete'] = 'ﾎ釆ｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ�';
 $labels['messagediscard'] = 'ﾎ耐�ﾏ狐�ﾏ∃ｹﾏ夷ｷ ﾎｼﾎｵ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ';
@@ -57,86 +57,89 @@ $labels['sender'] = 'ﾎ耐�ﾎｿﾏρ�ﾎｿﾎｻﾎｭﾎｱﾏ�';
 $labels['recipient'] = 'ﾎ�ﾎｱﾏ∃ｱﾎｻﾎｮﾏ�ﾏ�ﾎｷﾏ�';
 $labels['vacationaddresses'] = 'ﾎ�ﾏ�ﾏ狐πｸﾎｵﾏ�ﾎｷ ﾎｻﾎｯﾏρ�ﾎｱ email ﾏ�ﾎｱﾏ∃ｱﾎｻﾎｷﾏ�ﾏ�ﾏ斜ｽ (ﾎｴﾎｹﾎｱﾏ�ﾏ珂∃ｹﾏπｼﾎｭﾎｽﾎｷ ﾎｼﾎｵ ﾎｺﾏ湖ｼﾎｼﾎｱﾏ�ﾎｱ):';
 $labels['vacationdays'] = 'ﾎ｣ﾏ�ﾏ�ﾎｽﾏ狐�ﾎｷﾏ�ﾎｱ ﾎｱﾏ�ﾎｿﾏρ�ﾎｿﾎｻﾎｮﾏ� ﾎｼﾎｷﾎｽﾏ�ﾎｼﾎｬﾏ�ﾏ火ｽ (ﾏπｵ ﾎｷﾎｼﾎｭﾏ∃ｵﾏ�):';
+$labels['vacationinterval'] = 'ﾎ｣ﾏ�ﾏ�ﾎｽﾏ狐�ﾎｷﾏ�ﾎｱ ﾎｱﾏ�ﾎｿﾏρ�ﾎｿﾎｻﾎｮﾏ� ﾎｼﾎｷﾎｽﾏ�ﾎｼﾎｬﾏ�ﾏ火ｽ:';
+$labels['days'] = 'ﾎｷﾎｼﾎｵﾏ∃ｵﾏ�';
+$labels['seconds'] = 'ﾎｴﾎｵﾏ�ﾏ�ﾎｵﾏ�ﾏ湖ｻﾎｵﾏ�ﾏ�ﾎｱ';
 $labels['vacationreason'] = 'ﾎ｣ﾏ斜ｼﾎｱ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ� (ﾎｻﾏ湖ｳﾎｿﾏ� ﾎｱﾏ�ﾎｿﾏ�ﾏπｯﾎｱﾏ�):';
-$labels['vacationsubject'] = 'Message subject:';
+$labels['vacationsubject'] = 'ﾎ佩ｭﾎｼﾎｱ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ�: ';
 $labels['rulestop'] = 'ﾎ�ﾎｱﾏ済πｷ ﾎｵﾏ�ﾎｱﾎｻﾎｮﾎｸﾎｵﾏ�ﾏπｷﾏ� ﾎｺﾎｱﾎｽﾏ湖ｽﾏ火ｽ';
-$labels['enable'] = 'Enable/Disable';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['none'] = 'none';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count does not equal';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value does not equal';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
+$labels['enable'] = 'ﾎ偏ｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷ/ﾎ耐�ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷ';
+$labels['filterset'] = 'ﾎｦﾎｯﾎｻﾏ�ﾏ∃ｱ';
+$labels['filtersets'] = 'ﾎｦﾎｯﾎｻﾏ�ﾏ∃ｿ';
+$labels['filtersetadd'] = 'ﾎ�ﾏ∃ｿﾏπｸﾎｮﾎｺﾎｷ ﾏ�ﾎｯﾎｻﾏ�ﾏ�ﾏ火ｽ';
+$labels['filtersetdel'] = 'ﾎ釆ｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮ ﾏ�ﾎｯﾎｻﾏ�ﾏ�ﾏ火ｽ';
+$labels['filtersetact'] = 'ﾎ偏ｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷ ﾏ�ﾎｹﾎｻﾏ�ﾏ�ﾏ火ｽ';
+$labels['filtersetdeact'] = 'ﾎ耐�ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷ ﾏ�ﾎｹﾎｻﾏ�ﾏ�ﾏ火ｽ';
+$labels['filterdef'] = 'ﾎ渮∃ｹﾏπｼﾎｿﾏ� ﾏ�ﾎｹﾎｻﾏ�ﾏ∃ｿﾏ�';
+$labels['filtersetname'] = 'ﾎ湮ｽﾎｿﾎｼﾎｱﾏπｯﾎｱ ﾏ�ﾎｯﾎｻﾏ�ﾏ�ﾏ火ｽ';
+$labels['newfilterset'] = 'ﾎ斟ｵﾎｱ ﾏ�ﾎｹﾎｻﾏ�ﾏ∃ｱ';
+$labels['active'] = 'ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿ';
+$labels['none'] = 'ﾎｺﾎｱﾎｽﾎｭﾎｽﾎｱ';
+$labels['fromset'] = 'ﾎｱﾏ�ﾏ� ﾏ�ﾎｿ ﾏρ歳ｽﾎｿﾎｻﾎｿ ';
+$labels['fromfile'] = 'ﾎｱﾏ�ﾎｿ ﾎｱﾏ�ﾏ�ﾎｵﾎｹﾎｿ';
+$labels['filterdisabled'] = 'ﾎ耐�ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾎｼﾎｵﾎｽﾎｿ ﾏ�ﾎｹﾎｻﾏ�ﾏ∃ｿ';
+$labels['countisgreaterthan'] = 'ﾎｱﾏ∃ｯﾎｸﾎｼﾎｷﾏπｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｵﾎｳﾎｱﾎｻﾏ済�ﾎｵﾏ∃ｷ ﾎｱﾏ�ﾏ�';
+$labels['countisgreaterthanequal'] = 'ﾎｷ ﾎｼﾎｵﾏ�ﾏ∃ｷﾏπｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｵﾎｳﾎｱﾎｻﾏ済�ﾎｵﾏ∃ｷ ﾎｮ ﾎｯﾏπｷ ﾏ�ﾏ∃ｿﾏ�';
+$labels['countislessthan'] = 'ﾎｷ ﾎｼﾎｵﾏ�ﾏ∃ｷﾏπｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｹﾎｺﾏ�ﾏ狐�ﾎｵﾏ∃ｷ ﾎｱﾏ�ﾎｿ';
+$labels['countislessthanequal'] = 'ﾎｷ ﾎｼﾎｵﾏ�ﾏ∃ｷﾏπｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｹﾎｺﾏ�ﾏ狐�ﾎｵﾏ∃ｷ ﾎｮ ﾎｯﾏπｷ ﾏ�ﾏ∃ｿﾏ�';
+$labels['countequals'] = 'ﾎｷ ﾎｼﾎｭﾏ�ﾏ∃ｷﾏπｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｯﾏπｷ ﾏ�ﾏ∃ｿﾏ� ';
+$labels['countnotequals'] = 'ﾎｷ ﾎｼﾎｭﾏ�ﾏ∃ｷﾏπｷ ﾎｴﾎｵﾎｽ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｯﾏπｷ ﾏ�ﾏ∃ｿﾏ� ';
+$labels['valueisgreaterthan'] = 'ﾎｷ ﾏ�ﾎｹﾎｼﾎｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｵﾎｳﾎｱﾎｻﾏ済�ﾎｵﾏ∃ｷ ﾎｱﾏ�ﾏ�';
+$labels['valueisgreaterthanequal'] = 'ﾎｷ ﾏ�ﾎｹﾎｼﾎｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｵﾎｳﾎｱﾎｻﾏ済�ﾎｵﾏ∃ｷ ﾎｮ ﾎｯﾏπｷ ﾏ�ﾏ∃ｿﾏ�';
+$labels['valueislessthan'] = 'ﾎｷ ﾏ�ﾎｹﾎｼﾎｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｹﾎｺﾏ�ﾏ狐�ﾎｵﾏ∃ｷ ﾎｱﾏ�ﾎｿ';
+$labels['valueislessthanequal'] = 'ﾎｷ ﾏ�ﾎｹﾎｼﾎｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾎｹﾎｺﾏ�ﾏ狐�ﾎｵﾏ∃ｷ ﾎｮ ﾎｯﾏπｷ ﾏ�ﾏ∃ｿﾏ�';
+$labels['valueequals'] = 'ﾎｷ ﾏ�ﾎｹﾎｼﾎｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｯﾏπｷ ﾎｼﾎｵ';
+$labels['valuenotequals'] = 'ﾎｷ ﾏ�ﾎｹﾎｼﾎｷ ﾎｴﾎｵﾎｽ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｯﾏπｷ ﾎｼﾎｵ';
+$labels['setflags'] = 'ﾎ渮∃ｹﾏπｼﾏ狐� ﾏπｷﾎｼﾎｱﾎｯﾏ火ｽ ﾏρ�ﾎｿ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ';
+$labels['addflags'] = 'ﾎ�ﾏ∃ｿﾏπｸﾎｮﾎｺﾎｷ ﾏπｷﾎｼﾎｱﾎｯﾏ火ｽ ﾏρ�ﾎｿ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ';
+$labels['removeflags'] = 'ﾎ耐�ﾎｱﾎｹﾏ∃ｭﾏπｷ ﾏπｷﾎｼﾎｱﾎｯﾏ火ｽ ﾎｱﾏ�ﾏ� ﾏ�ﾎｿ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ';
+$labels['flagread'] = 'ﾎ対ｽﾎｱﾎｳﾎｽﾏ珂πｷ';
+$labels['flagdeleted'] = 'ﾎ釆ｹﾎｵﾎｳﾏ∃ｱﾎｼﾎｼﾎｭﾎｽﾎｿ';
+$labels['flaganswered'] = 'ﾎ耐�ﾎｱﾎｽﾏ�ﾎｮﾎｸﾎｷﾎｺﾎｵ ';
+$labels['flagflagged'] = 'ﾎ｣ﾎｷﾎｼﾎｵﾎｹﾏ火ｼﾎｭﾎｽﾎｿ';
+$labels['flagdraft'] = 'ﾎ�ﾏ�ﾏ狐�ﾎｵﾎｹﾏ∃ｱ';
+$labels['setvariable'] = 'ﾎ渮∃ｹﾏπｼﾏ狐� ﾎｼﾎｵﾏ�ﾎｱﾎｲﾎｻﾎｷﾏ�ﾎｮﾏ�';
+$labels['setvarname'] = 'ﾎ湖ｽﾎｿﾎｼﾎｱ ﾎｼﾎｵﾏ�ﾎｱﾎｲﾎｻﾎｷﾏ�ﾎｷﾏ�:';
+$labels['setvarvalue'] = 'ﾎ､ﾎｹﾎｼﾎｷ ﾎｼﾎｵﾏ�ﾎｱﾎｲﾎｻﾎｷﾏ�ﾎｷﾏ�:';
+$labels['setvarmodifiers'] = 'ﾎ､ﾏ∃ｿﾏ�ﾎｿﾏ�ﾎｿﾎｹﾎｷﾏ�ﾎｭﾏ�: ';
+$labels['varlower'] = 'ﾎ慚ｹﾎｺﾏ∃ｿﾎｳﾏ∃ｬﾎｼﾎｼﾎｱﾏ�ﾎｷ ﾎｳﾏ∃ｱﾏ�ﾎｮ';
+$labels['varupper'] = 'ﾎｺﾎｵﾏ�ﾎｱﾎｻﾎｱﾎｯﾎｱ ﾎｳﾏ∃ｬﾎｼﾎｼﾎｱﾏ�ﾎｱ ';
+$labels['varlowerfirst'] = 'ﾏ�ﾏ�ﾏ煮�ﾎｿﾏ� ﾏ�ﾎｱﾏ∃ｱﾎｺﾏ�ﾎｮﾏ∃ｱﾏ� ﾏ�ﾎｵﾎｶﾏ狐� ';
+$labels['varupperfirst'] = 'ﾏ�ﾏ�ﾏ煮�ﾎｿﾏ� ﾏ�ﾎｱﾏ∃ｱﾎｺﾏ�ﾎｮﾏ∃ｱﾏ� ﾎｺﾎｵﾏ�ﾎｱﾎｻﾎｱﾎｯﾎｱ ﾎｳﾏ∃ｬﾎｼﾎｼﾎｱﾏ�ﾎｱ';
+$labels['varquotewildcard'] = 'ﾏ�ﾎｱﾏ∃ｱﾎｸﾎｭﾏπｷ ﾎｵﾎｹﾎｴﾎｹﾎｺﾏ火ｽ ﾏ�ﾎｱﾏ∃ｱﾎｺﾏ�ﾎｮﾏ�ﾏ火ｽ';
+$labels['varlength'] = 'ﾎ慚ｮﾎｺﾎｿﾏ�';
+$labels['notify'] = 'ﾎ耐�ﾎｿﾏρ�ﾎｿﾎｻﾎｮ ﾎｵﾎｹﾎｴﾎｿﾏ�ﾎｿﾎｯﾎｷﾏπｷﾏ� ';
+$labels['notifyaddress'] = 'ﾎ｣ﾎｵ ﾎｴﾎｹﾎｵﾏ歳ｸﾏ�ﾎｽﾏπｷ email:';
+$labels['notifybody'] = 'ﾎ渮∃ｳﾎｱﾎｽﾎｹﾏπｼﾏ狐� ﾎｵﾎｹﾎｴﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷﾏ�:';
+$labels['notifysubject'] = 'ﾎ佩ｵﾎｼﾎｱ ﾎｵﾎｹﾎｴﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷﾏ�:';
+$labels['notifyfrom'] = 'ﾎ耐�ﾎｿﾏρ�ﾎｿﾎｻﾎｵﾎｱﾏ� ﾎｵﾎｹﾎｴﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷﾏ�:';
+$labels['notifyimportance'] = 'ﾎ｣ﾎｷﾎｼﾎｱﾏπｯﾎｱ: ';
+$labels['notifyimportancelow'] = 'ﾎｧﾎｱﾎｼﾎｷﾎｻﾎｮ';
+$labels['notifyimportancenormal'] = 'ﾎ墅ｱﾎｽﾎｿﾎｽﾎｹﾎｺﾎｮ';
+$labels['notifyimportancehigh'] = 'ﾎ･ﾏ夷ｷﾎｻﾎｮ';
+$labels['filtercreate'] = 'ﾎ釆ｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｯﾎｱ ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿﾏ�';
+$labels['usedata'] = 'ﾎｧﾏ∃ｷﾏπｹﾎｼﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷ ﾎｱﾎｺﾎｿﾎｻﾎｿﾏ�ﾎｸﾏ火ｽ ﾎｴﾎｵﾎｴﾎｿﾎｼﾎｵﾎｽﾏ火ｽ ﾏρ�ﾎｿ ﾏ�ﾎｹﾎｻﾏ�ﾏ∃ｿ:';
+$labels['nextstep'] = 'ﾎ変�ﾎｿﾎｼﾎｵﾎｽﾎｿ ﾎｲﾎｷﾎｼﾎｱ';
 $labels['...'] = '...';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['advancedopts'] = 'ﾎ�ﾏ∃ｿﾏ�ﾏ珂∃ｷﾎｼﾎｭﾎｽﾎｵﾏ� ﾏ�ﾏ�ﾎｸﾎｼﾎｯﾏπｵﾎｹﾏ�';
+$labels['body'] = 'ﾎ｣ﾏ斜ｼﾎｱ';
+$labels['address'] = 'ﾎ釆ｹﾎｵﾏ歳ｸﾏ�ﾎｽﾏπｷ';
+$labels['envelope'] = 'ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ�';
+$labels['modifier'] = 'ﾎ､ﾏ∃ｿﾏ�ﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷ: ';
+$labels['text'] = 'ﾎｺﾎｵﾎｹﾎｼﾎｵﾎｽﾎｿ';
+$labels['undecoded'] = 'ﾎｱﾏ�ﾎｿﾎｺﾏ火ｴﾎｹﾎｺﾎｿﾏ�ﾎｿﾎｹﾎｷﾎｼﾎｭﾎｽﾎｿ (raw)';
+$labels['contenttype'] = 'ﾎ､ﾏ済�ﾎｿﾏ� ﾏ�ﾎｵﾏ∃ｹﾎｵﾏ�ﾎｿﾎｼﾎｭﾎｽﾎｿﾏ� ';
+$labels['modtype'] = 'ﾏ�ﾏ�ﾏ�ﾎｿﾏ�:';
+$labels['allparts'] = 'ﾎ湖ｻﾎｱ';
+$labels['domain'] = 'ﾏ�ﾎｿﾎｼﾎｭﾎｱﾏ�';
+$labels['localpart'] = 'ﾏ�ﾎｿﾏ�ﾎｹﾎｺﾏ� ﾏ�ﾎｼﾎｮﾎｼﾎｱ ';
+$labels['user'] = 'ﾏ�ﾏ∃ｷﾏρ�ﾎｷﾏ�';
+$labels['detail'] = 'ﾎｻﾎｵﾏ�ﾏ�ﾎｿﾎｼﾎｵﾏ∃ｵﾎｹﾎｵﾏ�';
+$labels['comparator'] = 'ﾏρ歳ｳﾎｺﾏ∃ｹﾏπｷ:';
+$labels['default'] = 'ﾏ�ﾏ∃ｿﾎｵﾏ�ﾎｹﾎｻﾎｿﾎｳﾎｮ';
+$labels['octet'] = 'ﾎｱﾏ�ﾏρ�ﾎｷﾏ∃ｮ (ﾎｿﾎｺﾏ�ﾎｬﾎｴﾎｱ) ';
+$labels['asciicasemap'] = 'ﾏ�ﾎｵﾎｶﾎｬ ﾎｮ ﾎｺﾎｵﾏ�ﾎｱﾎｻﾎｱﾎｯﾎｱ (ascii-casemap)';
+$labels['asciinumeric'] = 'ﾎｱﾏ∃ｹﾎｸﾎｼﾎｷﾏ�ﾎｹﾎｺﾏ� (ascii-ﾎｱﾏ∃ｹﾎｸﾎｼﾎｷﾏ�ﾎｹﾎｺﾎｿ)';
 
 $messages = array();
 $messages['filterunknownerror'] = 'ﾎ�ﾎｳﾎｽﾏ珂ρ�ﾎｿ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ';
@@ -145,30 +148,30 @@ $messages['filterdeleteerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮﾏ� ﾏ�ﾎｯﾎｻﾏ�ﾏ�
 $messages['filterdeleted'] = 'ﾎ､ﾎｿ ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ�ﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�';
 $messages['filtersaved'] = 'ﾎ､ﾎｿ ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿ ﾎｱﾏ�ﾎｿﾎｸﾎｷﾎｺﾎｵﾏ済�ﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�';
 $messages['filtersaveerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｱﾏ�ﾎｿﾎｸﾎｮﾎｺﾎｵﾏ�ﾏπｷﾏ� ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿﾏ�. ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['filterdeleteconfirm'] = 'ﾎ偏ｯﾏρ�ﾎｵ ﾏπｯﾎｳﾎｿﾏ�ﾏ∃ｿﾎｹ ﾏ狐�ﾎｹ ﾎｸﾎｭﾎｻﾎｵﾏ�ﾎｵ ﾎｽﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ夷ｵﾏ�ﾎｵ ﾏ�ﾎｿ ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｭﾎｽﾎｿ ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿ? ';
 $messages['ruledeleteconfirm'] = 'ﾎ佩ｭﾎｻﾎｵﾏ�ﾎｵ ﾏ湖ｽﾏ�ﾏ珂� ﾎｽﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ夷ｵﾏ�ﾎｵ ﾏ�ﾎｿﾎｽ ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｭﾎｽﾎｿ ﾎｺﾎｱﾎｽﾏ湖ｽﾎｱ;';
 $messages['actiondeleteconfirm'] = 'ﾎ佩ｭﾎｻﾎｵﾏ�ﾎｵ ﾏ湖ｽﾏ�ﾏ珂� ﾎｽﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ夷ｵﾏ�ﾎｵ ﾏ�ﾎｷﾎｽ ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｭﾎｽﾎｷ ﾎｵﾎｽﾎｭﾏ∃ｳﾎｵﾎｹﾎｱ;';
 $messages['forbiddenchars'] = 'ﾎ慚ｷ ﾎｵﾏ�ﾎｹﾏ�ﾏ∃ｵﾏ�ﾏ�ﾎｿﾎｯ ﾏ�ﾎｱﾏ∃ｱﾎｺﾏ�ﾎｮﾏ∃ｵﾏ� ﾏρ�ﾎｿ ﾏ�ﾎｵﾎｴﾎｯﾎｿ';
 $messages['cannotbeempty'] = 'ﾎ､ﾎｿ ﾏ�ﾎｵﾎｴﾎｯﾎｿ ﾎｴﾎｵﾎｽ ﾎｼﾏ�ﾎｿﾏ∃ｵﾎｯ ﾎｽﾎｱ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｺﾎｵﾎｽﾏ�';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
-$messages['nametoolong'] = 'Name too long.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['ruleexist'] = 'ﾎｦﾎｹﾎｻﾏ�ﾏ∃ｿ ﾎｼﾎｵ ﾎｱﾏ�ﾏ�ﾎｿ ﾏ�ﾎｿ ﾏ湖ｽﾎｿﾎｼﾎｱ ﾏ�ﾏ�ﾎｬﾏ�ﾏ�ﾎｵﾎｹ ﾎｮﾎｴﾎｷ. ';
+$messages['setactivateerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷﾏ� ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｵﾎｽﾏ火ｽ ﾏ�ﾎｹﾎｻﾏ�ﾏ�ﾏ火ｽ. ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ.';
+$messages['setdeactivateerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｱﾏ�ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷﾏ� ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｵﾎｽﾏ火ｽ ﾏ�ﾎｹﾎｻﾏ�ﾏ�ﾏ火ｽ. ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ.';
+$messages['setdeleteerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮﾏ� ﾏ�ﾎｯﾎｻﾏ�ﾏ�ﾏ火ｽ. ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ';
+$messages['setactivated'] = 'ﾎｦﾎｯﾎｻﾏ�ﾏ∃ｱ ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｮﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
+$messages['setdeactivated'] = 'ﾎｦﾎｯﾎｻﾏ�ﾏ∃ｱ ﾎｱﾏ�ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｮﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
+$messages['setdeleted'] = 'ﾎ､ﾎｱ ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ�ﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�.';
+$messages['setdeleteconfirm'] = 'ﾎ佩ｭﾎｻﾎｵﾏ�ﾎｵ ﾏ湖ｽﾏ�ﾏ珂� ﾎｽﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ夷ｵﾏ�ﾎｵ ﾏ�ﾎｱ ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｭﾎｽﾎｱ ﾏ�ﾎｹﾎｻﾏ�ﾏ∃ｱ?';
+$messages['setcreateerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｴﾎｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｹﾎｱﾏ� ﾏ�ﾎｹﾎｻﾏ�ﾏ�ﾏ火ｽ. ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ.';
+$messages['setcreated'] = 'ﾎ､ﾎｱ ﾏ�ﾎｹﾎｻﾏ�ﾏ∃ｱ ﾎｴﾎｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｷﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['activateerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷﾏ� ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｵﾎｽﾎｿﾏ� ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿﾏ�(ﾏ火ｽ). ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ.';
+$messages['deactivateerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｱﾏ�ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾏπｷﾏ� ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｵﾎｽﾎｿﾏ� ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿﾏ�(ﾏ火ｽ). ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ.';
+$messages['deactivated'] = 'ﾎ､ﾎｿ ﾏ�ﾎｹﾎｻﾏ�ﾏ∃ｿ(ﾎｱ) ﾎｱﾏ�ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['activated'] = 'ﾎ､ﾎｿ ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿ(ﾎｱ) ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｷﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�.';
+$messages['moved'] = 'ﾎ､ﾎｿ ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿ ﾎｼﾎｵﾏ�ﾎｱﾎｺﾎｹﾎｽﾎｷﾎｸﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�.';
+$messages['moveerror'] = 'ﾎ対ｴﾏ�ﾎｽﾎｱﾎｼﾎｯﾎｱ ﾎｼﾎｵﾏ�ﾎｱﾎｺﾎｹﾎｽﾎｷﾏπｷﾏ� ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｵﾎｽﾎｿﾏ� ﾏ�ﾎｯﾎｻﾏ�ﾏ∃ｿﾏ�. ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾏρ�ﾎｬﾎｻﾎｼﾎｱ ﾏρ�ﾎｿﾎｽ ﾎｴﾎｹﾎｱﾎｺﾎｿﾎｼﾎｹﾏρ�ﾎｮ.';
+$messages['nametoolong'] = 'ﾎ､ﾎｿ ﾏ湖ｽﾎｿﾎｼﾎｱ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾏ�ﾎｿﾎｻﾏ� ﾎｼﾎｵﾎｳﾎｬﾎｻﾎｿ.';
+$messages['namereserved'] = 'ﾎ釆ｵﾏπｼﾎｵﾏ�ﾎｼﾎｭﾎｽﾎｿ ﾏ湖ｽﾎｿﾎｼﾎｱ. ';
+$messages['setexist'] = 'Set ﾏ�ﾏ�ﾎｬﾏ�ﾏ�ﾎｵﾎｹ ﾎｮﾎｴﾎｷ. ';
+$messages['nodata'] = 'ﾎ､ﾎｿﾏ�ﾎｻﾎｬﾏ�ﾎｹﾏρ�ﾎｿﾎｽ ﾎｼﾎｯﾎｱ ﾎｸﾎｭﾏπｷ ﾏ�ﾏ∃ｭﾏ�ﾎｵﾎｹ ﾎｽﾎｱ ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｵﾎｯ!';
 
 ?>
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 394b6c014..4dd4f7d8b 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/eo.inc b/plugins/managesieve/localization/eo.inc
index b30b08ab7..3ce49ddb2 100644
--- a/plugins/managesieve/localization/eo.inc
+++ b/plugins/managesieve/localization/eo.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sendanto';
 $labels['recipient'] = 'Ricevanto';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/es_AR.inc b/plugins/managesieve/localization/es_AR.inc
index 20dee2f74..c9c6e70f8 100644
--- a/plugins/managesieve/localization/es_AR.inc
+++ b/plugins/managesieve/localization/es_AR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuanto enviar mensajes (en dﾃｭas):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razﾃｳn de vacaciones):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index 430079288..69ad9ce8a 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuﾃ｡nto enviar mensajes (en dﾃｭas):';
+$labels['vacationinterval'] = 'Cada cuﾃ｡nto enviar mensajes:';
+$labels['days'] = 'dﾃｭas';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razﾃｳn de vacaciones):';
 $labels['vacationsubject'] = 'Asunto del Mensaje:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index 7e70a9d57..334a65cee 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Saatja';
 $labels['recipient'] = 'Saaja';
 $labels['vacationaddresses'] = 'Lisanimekiri saaja e-posti aadressidest (komadega eraldatud):';
 $labels['vacationdays'] = 'Kui tihti kirju saata (pﾃ､evades):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Kirja sisu (puhkuse pﾃｵhjus):';
 $labels['vacationsubject'] = 'Kirja teema:';
 $labels['rulestop'] = 'Peata reeglite otsimine';
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index 7185d8059..ebdc4531d 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'ﾙ�ﾘｱﾘｳﾘｪﾙ�ﾘｯﾙ�';
 $labels['recipient'] = 'ﾚｯﾛ鈷ｱﾙ�ﾘｯﾙ�';
 $labels['vacationaddresses'] = 'ﾘ｢ﾘｯﾘｱﾘｳ窶雇�ﾘｧﾛ� ﾘｧﾛ雇�ﾛ雇� ﾘｯﾛ顧ｯﾘｱ ﾙ�ﾙ� (ﾘｬﾘｯﾘｧ ﾘｴﾘｯﾙ� ﾘｨﾘｧ ﾙ維鈷ｱﾚｯﾙ異�):';
 $labels['vacationdays'] = 'ﾙｾﾛ鈷ｺﾘｧﾙ� ﾙ�ﾘｧ ﾘｯﾘｱ ﾚ�ﾙ� ﾙ�ﾙ畏ｧﾙぺｹﾛ� ﾙ�ﾘｱﾘｳﾘｪﾘｧﾘｯﾙ� ﾘｴﾘｯﾙ�ﾘｯ (ﾘｯﾘｱ ﾘｱﾙ畏ｲﾙ�ﾘｧﾛ�):';
+$labels['vacationinterval'] = 'ﾙ�ﾙ畏ｧﾙぺｹﾛ� ﾚｩﾙ� ﾙｾﾛ鈷ｺﾘｧﾙ�窶雇�ﾘｧ ﾘｧﾘｱﾘｳﾘｧﾙ� ﾙ�ﾛ娯�鈷ｴﾙ異�ﾘｯ:';
+$labels['days'] = 'ﾘｱﾙ畏ｲﾙ�ﾘｧ';
+$labels['seconds'] = 'ﾘｫﾘｧﾙ�ﾛ雇�窶雇�ﾘｧ';
 $labels['vacationreason'] = 'ﾘｨﾘｯﾙ�ﾙ� ﾙｾﾛ鈷ｺﾘｧﾙ� (ﾘｹﾙ�ﾘｪ ﾙ�ﾘｳﾘｧﾙ�ﾘｱﾘｪ):';
 $labels['vacationsubject'] = 'ﾙ�ﾙ畏ｶﾙ畏ｹ ﾙｾﾛ鈷ｺﾘｧﾙ�:';
 $labels['rulestop'] = 'ﾘｪﾙ異ほ� ﾙほ畏ｧﾙ�ﾛ雇� ﾘｧﾘｱﾘｲﾛ鈷ｧﾘｨﾛ�';
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index 18cd0c68f..71856c95f 100644
--- a/plugins/managesieve/localization/fi_FI.inc
+++ b/plugins/managesieve/localization/fi_FI.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Lﾃ､hettﾃ､jﾃ､';
 $labels['recipient'] = 'Vastaanottaja';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Viestin aihe:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index 912c03f48..c269fd32e 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Expﾃｩditeur';
 $labels['recipient'] = 'Destinataire';
 $labels['vacationaddresses'] = 'Liste des destinataires (sﾃｩparﾃｩs par une virgule) :';
 $labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours) :';
+$labels['vacationinterval'] = 'Comment envoyer les messages :';
+$labels['days'] = 'jours';
+$labels['seconds'] = 'secondes';
 $labels['vacationreason'] = 'Corps du message (raison de l\'absence) :';
 $labels['vacationsubject'] = 'Sujet du message:';
 $labels['rulestop'] = 'Arrﾃｪter d\'ﾃｩvaluer les prochaines rﾃｨgles';
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index 4a4ec3dc5..fef5ed718 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -34,10 +34,10 @@ $labels['filteris'] = 'ﾃｩ igual a';
 $labels['filterisnot'] = 'non ﾃｩ igual a';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'non existe';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
+$labels['filtermatches'] = 'casa coa expresiﾃｳn';
+$labels['filternotmatches'] = 'non casa coa expresiﾃｳn';
+$labels['filterregex'] = 'casa coa expresiﾃｳn regular';
+$labels['filternotregex'] = 'non casa coa expresiﾃｳn regular';
 $labels['filterunder'] = 'baixo';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Engadir regra';
@@ -57,12 +57,15 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de enderezos de correo de destinatarios adicionais (separados por comas):';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en dﾃｭas):';
+$labels['vacationinterval'] = 'Con quﾃｩ frecuencia vanse enviar mensaxes:';
+$labels['days'] = 'dﾃｭas';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Corpo da mensaxe (razﾃｳn de vacaciﾃｳns):';
-$labels['vacationsubject'] = 'Message subject:';
+$labels['vacationsubject'] = 'Asunto da mensaxe:';
 $labels['rulestop'] = 'Parar de avaliar regras';
 $labels['enable'] = 'Activar/Desactivar';
 $labels['filterset'] = 'Conxunto de filtros';
-$labels['filtersets'] = 'Filter sets';
+$labels['filtersets'] = 'Conxunto de filtros';
 $labels['filtersetadd'] = 'Engadir un conxunto de filtros';
 $labels['filtersetdel'] = 'Eliminar o conxunto de filtros actual';
 $labels['filtersetact'] = 'Activar o conxunto de filtros actual';
@@ -75,68 +78,68 @@ $labels['none'] = 'ningﾃｺn';
 $labels['fromset'] = 'de conxunto';
 $labels['fromfile'] = 'de arquivo';
 $labels['filterdisabled'] = 'Filtro desactivado';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count does not equal';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value does not equal';
+$labels['countisgreaterthan'] = 'a conta ﾃｩ meirande que';
+$labels['countisgreaterthanequal'] = 'a conta ﾃｩ meirande ou igual a';
+$labels['countislessthan'] = 'a conta ﾃｩ menor que';
+$labels['countislessthanequal'] = 'a conta ﾃｩ menor ou igual a';
+$labels['countequals'] = 'a conta ﾃｩ igual a';
+$labels['countnotequals'] = 'a conta non ﾃｩ igual a';
+$labels['valueisgreaterthan'] = 'o valor ﾃｩ meirande que ';
+$labels['valueisgreaterthanequal'] = 'o valor ﾃｩ meirande ou igual a';
+$labels['valueislessthan'] = 'o valor ﾃｩ menor que';
+$labels['valueislessthanequal'] = 'o valor ﾃｩ menor ou igual a';
+$labels['valueequals'] = 'o valor ﾃｩ igual a';
+$labels['valuenotequals'] = 'o valor non ﾃｩ igual a';
 $labels['setflags'] = 'Set flags to the message';
 $labels['addflags'] = 'Add flags to the message';
 $labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
+$labels['flagread'] = 'Lidas';
+$labels['flagdeleted'] = 'Eliminadas';
+$labels['flaganswered'] = 'Respostadas';
+$labels['flagflagged'] = 'Marcadas';
+$labels['flagdraft'] = 'Borrador';
+$labels['setvariable'] = 'Establecer variable';
+$labels['setvarname'] = 'Nome da variable:';
+$labels['setvarvalue'] = 'Valor da variable:';
+$labels['setvarmodifiers'] = 'Modificadores:';
+$labels['varlower'] = 'minﾃｺscula';
+$labels['varupper'] = 'maiﾃｺscula';
+$labels['varlowerfirst'] = 'primeira letra minﾃｺscula';
+$labels['varupperfirst'] = 'primeira letra maiﾃｺscula';
 $labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
+$labels['varlength'] = 'lonxitude';
+$labels['notify'] = 'Enviar notificaciﾃｳn';
+$labels['notifyaddress'] = 'Destinatario:';
+$labels['notifybody'] = 'Corpo da notificaciﾃｳn:';
+$labels['notifysubject'] = 'Asunto da notificaciﾃｳn:';
+$labels['notifyfrom'] = 'Remitente da notificaciﾃｳn:';
+$labels['notifyimportance'] = 'Importancia:';
+$labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
+$labels['notifyimportancehigh'] = 'alta';
+$labels['filtercreate'] = 'Crear filtro';
+$labels['usedata'] = 'Usar os seguintes datos no filtro:';
+$labels['nextstep'] = 'Seguinte paso';
 $labels['...'] = '...';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
+$labels['advancedopts'] = 'Opciﾃｳns avanzadas';
+$labels['body'] = 'Corpo';
+$labels['address'] = 'enderezo';
 $labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['modifier'] = 'modificador:';
+$labels['text'] = 'texto';
+$labels['undecoded'] = 'sen codificar (en bruto)';
+$labels['contenttype'] = 'tipo de contido';
+$labels['modtype'] = 'tipo:';
+$labels['allparts'] = 'todos';
+$labels['domain'] = 'dominio';
+$labels['localpart'] = 'parte local';
+$labels['user'] = 'usuario';
+$labels['detail'] = 'detalle';
+$labels['comparator'] = 'comparador';
+$labels['default'] = 'defecto';
+$labels['octet'] = 'estricto (octeto)';
+$labels['asciicasemap'] = 'non sensible a maiﾃｺsculas/minﾃｺsculas (ascii-casemap)';
+$labels['asciinumeric'] = 'numﾃｩrico (ascii-numerico)';
 
 $messages = array();
 $messages['filterunknownerror'] = 'Erro descoﾃｱecido servidor';
@@ -150,7 +153,7 @@ $messages['ruledeleteconfirm'] = 'Estﾃ｡ seguro de que desexa eliminar a regra se
 $messages['actiondeleteconfirm'] = 'Estﾃ｡ seguro de que desexa eliminar a acciﾃｳn seleccionada?';
 $messages['forbiddenchars'] = 'Caracteres non permitidos no campo';
 $messages['cannotbeempty'] = 'O campo non pode estar baleiro';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
+$messages['ruleexist'] = 'Xa existe un filtro con nome especificado.';
 $messages['setactivateerror'] = 'Imposible activar o conxunto de filtros seleccionado. Ocurriu un erro no servidor';
 $messages['setdeactivateerror'] = 'Imposible desactivar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
 $messages['setdeleteerror'] = 'Imposible eliminar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
@@ -160,15 +163,15 @@ $messages['setdeleted'] = 'O Conxunto de filtros borrouse con ﾃｩxito';
 $messages['setdeleteconfirm'] = 'Estﾃ｡ seguro de que desexa eliminar o conxunto de filtros seleccionado?';
 $messages['setcreateerror'] = 'Imposible crear o conxunto de filtros. Ocurriu un error no servidor';
 $messages['setcreated'] = 'Conxunto de filtros creado con ﾃｩxito';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
+$messages['activateerror'] = 'Non foi posible activar o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
+$messages['deactivateerror'] = 'Non foi posible desactivar o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
+$messages['deactivated'] = 'Desactivﾃ｡ronse os filtros correctamente.';
+$messages['activated'] = 'Activﾃ｡ronse os filtros correctamente';
+$messages['moved'] = 'Moveuse correctamente o filtro.';
+$messages['moveerror'] = 'Non foi posible mover o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
 $messages['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome ﾃｩ longo de mﾃ｡is';
-$messages['namereserved'] = 'Reserved name.';
+$messages['namereserved'] = 'Nome reservado';
 $messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = 'ﾃ� preciso seleccionar polo menos unha posiciﾃｳn!';
 
 ?>
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index 547913199..aa736ac87 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'ﾗ蕃ｩﾗ勉慵�';
 $labels['recipient'] = 'ﾗ蕃�ﾗ槞｢ﾗ�';
 $labels['vacationaddresses'] = 'ﾗ嶼ｪﾗ勉泰勉ｪ ﾗ沌勉�"ﾗ� ﾗ�ﾗ勉｡ﾗ､ﾗ勉ｪ ﾗｩﾗ慵� (ﾗ槞勉､ﾗｨﾗ沌勉ｪ ﾗ｢"ﾗ� ﾗ､ﾗ｡ﾗ燮ｧﾗ燮�)';
 $labels['vacationdays'] = 'ﾗ泰碩燮儲� ﾗｪﾗ沌燮ｨﾗ勉ｪ ( ﾗ泰燮槞燮� ) ﾗ慵ｩﾗ慵勉� ﾗ蕃勉沌｢ﾗ勉ｪ:';
+$labels['vacationinterval'] = 'ﾗ泰碩燮儲� ﾗｪﾗ沌燮ｨﾗ勉ｪ ﾗ慵ｩﾗ慵勉� ﾗ蕃蕃勉沌｢ﾗ�';
+$labels['days'] = 'ﾗ燮槞燮�';
+$labels['seconds'] = 'ﾗｩﾗ�ﾗ燮勉ｪ';
 $labels['vacationreason'] = 'ﾗ潰勉｣ ﾗ蕃蕃勉沌｢ﾗ� (ﾗ｡ﾗ燮泰ｪ ﾗ蕃隣勉､ﾗｩﾗ�):';
 $labels['vacationsubject'] = 'ﾗ�ﾗ勉ｩﾗ� ﾗ蕃蕃勉沌｢ﾗ�:';
 $labels['rulestop'] = 'ﾗ｢ﾗｦﾗ燮ｨﾗ� ﾗｩﾗ� ﾗ泰隣燮�ﾗｪ ﾗ蕃嶼慵慵燮�';
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index c38ed3ee2..64b9bef62 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Poﾅ｡iljatelj';
 $labels['recipient'] = 'Primatelj';
 $labels['vacationaddresses'] = 'Dodatna lista primatelja (odvojenih zarezom):';
 $labels['vacationdays'] = 'Koliko ﾄ稿sto slati poruku (u danima):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Tijelo poruke (razlog odmora):';
 $labels['vacationsubject'] = 'Naslov poruke:';
 $labels['rulestop'] = 'Prekini izvoﾄ粗nje filtera';
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index de4f687d8..9d39ffac3 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Feladﾃｳ';
 $labels['recipient'] = 'Cﾃｭmzett';
 $labels['vacationaddresses'] = 'Tovﾃ｡bbi cﾃｭmzettek (vesszﾅ宋el elvﾃ｡lasztva):';
 $labels['vacationdays'] = 'Vﾃ｡laszﾃｼzenet kﾃｼldﾃｩse ennyi naponkﾃｩnt:';
+$labels['vacationinterval'] = 'Milyen gyakran kﾃｼld ﾃｼzeneteket:';
+$labels['days'] = 'napok';
+$labels['seconds'] = 'mﾃ｡sodpercek';
 $labels['vacationreason'] = 'Levﾃｩl szﾃｶvege (automatikus vﾃ｡lasz):';
 $labels['vacationsubject'] = 'ﾃ忝enet tﾃ｡rgya:';
 $labels['rulestop'] = 'Mﾅｱveletek vﾃｩgrehajtﾃ｡sﾃ｡nak befejezﾃｩse';
diff --git a/plugins/managesieve/localization/hy_AM.inc b/plugins/managesieve/localization/hy_AM.inc
index a0c1c7cca..908175f1d 100644
--- a/plugins/managesieve/localization/hy_AM.inc
+++ b/plugins/managesieve/localization/hy_AM.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'ﾕ椅ぷｲﾕ｡ﾖ�ﾕｯﾕｸﾕｲ';
 $labels['recipient'] = 'ﾕ祭ｿﾕ｡ﾖ�ﾕｸﾕｲ';
 $labels['vacationaddresses'] = 'ﾔｻﾕｴ ﾕｰﾕ｡ﾕｾﾕ･ﾕｬﾕｵﾕ｡ﾕｬ ﾕｧﾕｬﾖψｸﾕｽﾕｿﾕｫ ﾕｰﾕ｡ﾕｽﾖ�ﾕ･ﾕｶﾕ･ﾖ� (ﾕ｢ﾕ｡ﾕｪﾕ｡ﾕｶﾕｾﾕ｡ﾕｮ ﾕｽﾕｿﾕｸﾖ�ﾕ｡ﾕｯﾕ･ﾕｿﾕｶﾕ･ﾖ�ﾕｸﾕｾ).';
 $labels['vacationdays'] = 'ﾔｻﾕｶﾕｹ ﾕｰﾕ｡ﾕｳﾕ｡ﾕｭﾕｸﾖぷｩﾕｵﾕ｡ﾕｴﾕ｢ ﾕｸﾖぷｲﾕ｡ﾖ�ﾕｯﾕ･ﾕｬ ﾕｰﾕ｡ﾕｲﾕｸﾖ�ﾕ､ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕｸﾖぷｶﾕｶﾕ･ﾖ�ﾕｨ (ﾖ�ﾖ�ﾕ･ﾖ�)`';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'ﾕ�ﾕ｡ﾕｲﾕｸﾖ�ﾕ､ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕ｡ﾕｶ ﾕ｢ﾕｸﾕｾﾕ｡ﾕｶﾕ､ﾕ｡ﾕｯﾕｸﾖぷｩﾕｵﾕｸﾖぷｶ (ﾕ｡ﾖ�ﾕｱﾕ｡ﾕｯﾕｸﾖへ�ﾕ､ﾕｫ ﾕｺﾕ｡ﾕｿﾕｳﾕ｡ﾕｼ)`';
 $labels['vacationsubject'] = 'ﾕ�ﾕ｡ﾕｲﾕｸﾖ�ﾕ､ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕ｡ﾕｶ ﾕｾﾕ･ﾖ�ﾕｶﾕ｡ﾕ｣ﾕｫﾖ�`';
 $labels['rulestop'] = 'ﾔｴﾕ｡ﾕ､ﾕ｡ﾖ�ﾕ･ﾕｬ ﾕｺﾕ｡ﾕｵﾕｴﾕ｡ﾕｶﾕｶﾕ･ﾖ�ﾕｫ ﾕｽﾕｿﾕｸﾖぷ｣ﾕｸﾖぷｴﾕｨ';
diff --git a/plugins/managesieve/localization/ia.inc b/plugins/managesieve/localization/ia.inc
index f4ea903be..45f6e5263 100644
--- a/plugins/managesieve/localization/ia.inc
+++ b/plugins/managesieve/localization/ia.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/id_ID.inc b/plugins/managesieve/localization/id_ID.inc
index 0e9245d6f..a30c2a0b0 100644
--- a/plugins/managesieve/localization/id_ID.inc
+++ b/plugins/managesieve/localization/id_ID.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pengirim';
 $labels['recipient'] = 'Penerima';
 $labels['vacationaddresses'] = 'Alamat email tambahan saya (dipisahkan koma):';
 $labels['vacationdays'] = 'Seberapa sering mengirim pesan (dalam hari):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Isi pesan (alasan liburan):';
 $labels['vacationsubject'] = 'Judul pesan:';
 $labels['rulestop'] = 'Berhenti mengevaluasi aturan';
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index bcbf4d186..0ac4f293a 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Mittente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista di indirizzi e-mail di destinatari addizionali (separati da virgola):';
 $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
+$labels['vacationinterval'] = 'Ogni quanto tempo inviare i messaggi:';
+$labels['days'] = 'giorni';
+$labels['seconds'] = 'secondi';
 $labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):';
 $labels['vacationsubject'] = 'Oggetto del messaggio';
 $labels['rulestop'] = 'Non valutare le regole successive';
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index 715827bd4..0cd4f44b9 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -57,6 +57,9 @@ $labels['sender'] = '騾∽ｿ｡閠�';
 $labels['recipient'] = '螳帛��';
 $labels['vacationaddresses'] = '髮ｻ蟄舌Γ繝ｼ繝ｫ縺ｮ螳帛�医�ｮ(繧ｳ繝ｳ繝槫玄蛻�縺｣縺�)霑ｽ蜉�縺ｮ繝ｪ繧ｹ繝�:';
 $labels['vacationdays'] = '繝｡繝�繧ｻ繝ｼ繧ｸ繧�(1譌･縺ｫ)騾∽ｿ｡縺吶ｋ鬆ｻ蠎ｦ:';
+$labels['vacationinterval'] = '繝｡繝�繧ｻ繝ｼ繧ｸ繧帝�∽ｿ｡縺吶ｋ鬆ｻ蠎ｦ:';
+$labels['days'] = '譌･';
+$labels['seconds'] = '遘�';
 $labels['vacationreason'] = '繝｡繝�繧ｻ繝ｼ繧ｸ譛ｬ菴�(莨第嚊縺ｮ逅�逕ｱ):';
 $labels['vacationsubject'] = '繝｡繝�繧ｻ繝ｼ繧ｸ縺ｮ莉ｶ蜷�:';
 $labels['rulestop'] = '繝ｫ繝ｼ繝ｫ縺ｮ隧穂ｾ｡繧貞●豁｢';
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
index 8445c297d..5ab4fc220 100644
--- a/plugins/managesieve/localization/ko_KR.inc
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -19,156 +19,159 @@
 
 $labels['filters'] = '�符�┣';
 $labels['managefilters'] = '��們侠 �ｩ肥攵 �符�┣ �ｴ��ｦｬ';
-$labels['filtername'] = '�符�┣ �擽�ｦ�';
+$labels['filtername'] = '�符�┣�ｪ�';
 $labels['newfilter'] = '�ヨ �符�┣';
 $labels['filteradd'] = '�符�┣ �ｶ緋ｰ�';
 $labels['filterdel'] = '�符�┣ �く���';
 $labels['moveup'] = '�怱�｡� �擽�徐';
 $labels['movedown'] = '�符�椈�｡� �擽�徐';
-$labels['filterallof'] = '�共�搆�乱 �丶�株 �ｷ懍ｹ呱豆 ����ｶ��凰 �攵�ｹ�';
-$labels['filteranyof'] = '�共�搆�乱 �丶�株 �ｷ懍ｹ呱豆 �､� �牟�蔓�復 �ｲ� �擽�攵�巡 �攵�ｹ�';
+$labels['filterallof'] = '�共�搆�攪 �ｪｨ�蕩 �ｷ懍ｹ呟ｳｼ �攵�ｹ倆物';
+$labels['filteranyof'] = '�共�搆 �ｷ懍ｹ� �､� �葺�ｘ�攵�巡 �攵�ｹ倆物';
 $labels['filterany'] = '�ｪｨ�蕩 �ｩ肥亨�ｧ�';
-$labels['filtercontains'] = '�小�物�鮒�笈�共';
-$labels['filternotcontains'] = '�小�物�葺�ｧ� �賦�慣�笈�共';
-$labels['filteris'] = '�凰 �ｰ呷慣�笈�共';
-$labels['filterisnot'] = '�凰 �ｰ呷ｧ� �賦�慣�笈�共';
-$labels['filterexists'] = '�｡ｴ�椪�鮒�笈�共';
-$labels['filternotexists'] = '�｡ｴ�椪�葺�ｧ� �賦�慣�笈�共';
-$labels['filtermatches'] = '�像����享�ｳｼ �攵�ｹ倆鮒�笈�共';
-$labels['filternotmatches'] = '�像����享�ｳｼ �攵�ｹ倆葺�ｧ� �賦�慣�笈�共';
-$labels['filterregex'] = '��母ｷ懦像����享�ｳｼ �攵�ｹ倆鮒�笈�共';
-$labels['filternotregex'] = '��母ｷ� �像����享�ｳｼ �攵�ｹ倆葺�ｧ� �賦�慣�笈�共';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = '�ｷ懍ｹ� �鵠�葺�ｸｰ';
+$labels['filtercontains'] = '�共�搆�揆 �小�物�物';
+$labels['filternotcontains'] = '�共�搆�揆 �小�物�葺�ｧ� �賦�搆';
+$labels['filteris'] = '�共�搆�ｳｼ �ｰ呷搆';
+$labels['filterisnot'] = '�共�搆�ｳｼ �ｰ呷ｧ� �賦�搆';
+$labels['filterexists'] = '�共�搆�擽 �｡ｴ�椪�物';
+$labels['filternotexists'] = '�共�搆�擽 �｡ｴ�椪�葺�ｧ� �賦�搆';
+$labels['filtermatches'] = '�共�搆 �像����享�ｳｼ �攵�ｹ倆物';
+$labels['filternotmatches'] = '�共�搆 �像����享�ｳｼ �攵�ｹ倆葺�ｧ� �賦�搆';
+$labels['filterregex'] = '�共�搆 ��母ｷ� �像����享�ｳｼ �攵�ｹ倆物';
+$labels['filternotregex'] = '�共�搆 ��母ｷ� �像����享�ｳｼ �攵�ｹ倆葺�ｧ� �賦�搆';
+$labels['filterunder'] = '�共�搆�ｳｴ�共 �符�椈�桷';
+$labels['filterover'] = '�共�搆�ｳｴ�共 �怱�桷';
+$labels['addrule'] = '�ｷ懍ｹ� �ｶ緋ｰ�';
 $labels['delrule'] = '�ｷ懍ｹ� �く���';
-$labels['messagemoveto'] = '�ｩ肥亨�ｧ� �擽�徐';
-$labels['messageredirect'] = '�ｩ肥亨�ｧ��･ｼ Redirect';
-$labels['messagecopyto'] = '�ｩ肥亨�ｧ��･ｼ �ｳｵ�ぎ';
-$labels['messagesendcopy'] = '�ｩ肥亨�ｧ��攪 �ｳｵ�ぎ�ｳｸ �ｳｴ�ざ�ｸｰ';
-$labels['messagereply'] = '�ｩ肥亨�ｧ��乱 �嚮�侠�葺�ｸｰ';
-$labels['messagedelete'] = '�ｩ肥亨�ｧ� �く���';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
+$labels['messagemoveto'] = '�ｩ肥亨�ｧ��･ｼ �共�搆 �怱�ｹ俯｡� �擽�徐�物';
+$labels['messageredirect'] = '�ｩ肥亨�ｧ��･ｼ �共�搆 �｣ｼ��誤｡� �����｡�物';
+$labels['messagecopyto'] = '�ｩ肥亨�ｧ��･ｼ �共�搆 �怱�ｹ俯｡� �ｳｵ�ぎ�物';
+$labels['messagesendcopy'] = '�ｩ肥亨�ｧ��攪 �ぎ�ｳｸ�揆 �共�搆 �怱�ｹ俯｡� �ｳｴ�ヤ';
+$labels['messagereply'] = '�共�搆 �ｩ肥亨�ｧ��｡� �嚮�侠';
+$labels['messagedelete'] = '�ｩ肥亨�ｧ��･ｼ �く���';
+$labels['messagediscard'] = '�共�搆 �ｩ肥亨�ｧ��凰 �物�ｻ� �署�ｸｰ';
+$labels['messagesrules'] = '�紛�胸 �ｰ幗捩 �ｩ肥攵:';
+$labels['messagesactions'] = '...�共�搆 �徐�梠�揆 �共�哩:';
 $labels['add'] = '�ｶ緋ｰ�';
 $labels['del'] = '�く���';
-$labels['sender'] = '�ｳｴ�ず �ぎ�梃';
-$labels['recipient'] = '��們侠�梵';
-$labels['vacationaddresses'] = '�ｘ�攪 �ｶ緋ｰ� e-mail �｣ｼ���(�豆) (�ｽ､�ｧ壱｡� �ｵｬ�ｶ� �勢):';
-$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['sender'] = '�ｰ懍侠�攤';
+$labels['recipient'] = '��們侠�攤';
+$labels['vacationaddresses'] = '�ｘ�攪 �ｶ緋ｰ� �擽�ｩ肥攵 �｣ｼ��� (�仮�像�｡� �ｵｬ�ｶ��勢):';
+$labels['vacationdays'] = '�ｩ肥亨�ｧ� �ｰ懍侠 �｣ｼ�ｸｰ (�攵):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '�ｩ肥亨�ｧ� �ｳｸ�ｬｸ (�惷�ｰ� �ぎ�悛):';
 $labels['vacationsubject'] = '�ｩ肥亨�ｧ� ��罹ｪｩ:';
-$labels['rulestop'] = '�ｷ懍ｹ呷攪 �共�哩�揆 �ｩ溢ｶ､';
-$labels['enable'] = '�ぎ�圸/�ぎ�圸�譜�物';
-$labels['filterset'] = '�符�┣ �ｬｶ�搆';
-$labels['filtersets'] = '�符�┣ �ｬｶ�搆';
-$labels['filtersetadd'] = '�符�┣ �ｬｶ�搆 �ｶ緋ｰ�';
-$labels['filtersetdel'] = '����椪 �符�┣ �ｬｶ�搆�揆 �く���';
+$labels['rulestop'] = '�ｷ懍ｹ� �初�ｰ��･ｼ �､瀧卿';
+$labels['enable'] = '�劈�┳�剩/�ｹ��劈�┳�剩';
+$labels['filterset'] = '�符�┣ �┷�敢';
+$labels['filtersets'] = '�符�┣ �┷�敢';
+$labels['filtersetadd'] = '�符�┣ �┷�敢 �ｶ緋ｰ�';
+$labels['filtersetdel'] = '����椪 �符�┣ �┷�敢�･ｼ �く���';
 $labels['filtersetact'] = '����椪 �符�┣ �┷�敢�･ｼ �劈�┳�剩';
 $labels['filtersetdeact'] = '����椪 �符�┣ �┷�敢�･ｼ �ｹ��劈�┳�剩';
 $labels['filterdef'] = '�符�┣ ��菩攪';
-$labels['filtersetname'] = '�符�┣ �┷�敢 �擽�ｦ�';
-$labels['newfilterset'] = '�ヨ�｡懍垓 �符�┣ �┷�敢';
+$labels['filtersetname'] = '�符�┣ �┷�敢�ｪ�';
+$labels['newfilterset'] = '�ヨ �符�┣ �┷�敢';
 $labels['active'] = '�劈�┳';
 $labels['none'] = '�螺�搆';
-$labels['fromset'] = '�ｬｶ�搆�愍�｡� �ｶ��┣';
-$labels['fromfile'] = '�血�攵�｡� �ｶ��┣';
-$labels['filterdisabled'] = '�符�┣ �ぎ�圸�葺�ｧ� �賦�搆';
-$labels['countisgreaterthan'] = '�ｰｯ��俾ｰ� �⊂';
-$labels['countisgreaterthanequal'] = '�ｰｯ��俾ｰ� �〓�ｱｰ�ｘ �ｰ呷搆';
-$labels['countislessthan'] = '�ｰｯ��俾ｰ� �梠�搆';
-$labels['countislessthanequal'] = '�ｰｯ��俾ｰ� �梠�ｱｰ�ｘ �ｰ呷搆';
-$labels['countequals'] = '�ｰｯ��俾ｰ� �ｰ呷搆';
-$labels['countnotequals'] = '�ｰｯ��俾ｰ� �ｰ呷ｧ� �賦�搆';
-$labels['valueisgreaterthan'] = '�ｰ廷擽 �⊂';
-$labels['valueisgreaterthanequal'] = '�ｰ廷擽 �〓�ｱｰ�ｘ �ｰ呷搆';
-$labels['valueislessthan'] = '�ｰ廷擽 �梠�搆';
-$labels['valueislessthanequal'] = '�ｰ廷擽 �梠�ｱｰ�ｘ �ｰ呷搆';
-$labels['valueequals'] = '�ｰ廷擽 �ｰ呷搆';
-$labels['valuenotequals'] = '�ｰ廷擽 �ｰ呷ｧ� �賦�搆';
-$labels['setflags'] = '�ｩ肥亨�ｧ��乱 �伯�椈�ｷｸ�･ｼ �└���';
-$labels['addflags'] = '�ｩ肥亨�ｧ��乱 �伯�椈�ｷｸ�･ｼ �ｶ緋ｰ�';
-$labels['removeflags'] = '�ｩ肥亨�ｧ��乱��� �伯�椈�ｷｸ�･ｼ ��懋ｱｰ';
+$labels['fromset'] = '�┷�敢�｡罹ｶ��┣';
+$labels['fromfile'] = '�血�攵�｡罹ｶ��┣';
+$labels['filterdisabled'] = '�符�┣�ｰ� �ｹ��劈�┳�剩�勢';
+$labels['countisgreaterthan'] = '�ｰ懍�俾ｰ� �共�搆�ｳｴ�共 �⊂';
+$labels['countisgreaterthanequal'] = '�ｰ懍�俾ｰ� �共�搆�ｳｴ�共 �〓�ｱｰ�ｘ �ｰ呷搆';
+$labels['countislessthan'] = '�ｰ懍�俾ｰ� �共�搆�ｳｴ�共 �梠�搆';
+$labels['countislessthanequal'] = '�ｰ懍�俾ｰ� �梠�ｱｰ�ｘ �ｰ呷搆';
+$labels['countequals'] = '�ｰ懍�俾ｰ� �共�搆�ｳｼ �ｰ呷搆';
+$labels['countnotequals'] = '�ｰ懍�俾ｰ� �共�搆�ｳｼ �ｰ呷ｧ� �賦�搆';
+$labels['valueisgreaterthan'] = '�ｰ廷擽 �共�搆�ｳｴ�共 �⊂';
+$labels['valueisgreaterthanequal'] = '�ｰ廷擽 �共�搆�ｳｴ�共 �〓�ｱｰ�ｘ �ｰ呷搆';
+$labels['valueislessthan'] = '�ｰ廷擽 �共�搆�ｳｴ�共 �梠�搆';
+$labels['valueislessthanequal'] = '�ｰ廷擽 �共�搆�ｳｴ�共 �梠�ｱｰ�ｘ �ｰ呷搆';
+$labels['valueequals'] = '�ｰ廷擽 �共�搆�ｳｼ �ｰ呷搆';
+$labels['valuenotequals'] = '�ｰ廷擽 �共�搆�ｳｼ �ｰ呷ｧ� �賦�搆';
+$labels['setflags'] = '�ｩ肥亨�ｧ��乱 �ｹ��ｰ懍揆 �└���';
+$labels['addflags'] = '�ｩ肥亨�ｧ��乱 �ｹ��ｰ懍揆 �ｶ緋ｰ�';
+$labels['removeflags'] = '�ｩ肥亨�ｧ��乱��� �ｹ��ｰ懍揆 ��懋ｱｰ';
 $labels['flagread'] = '�攷�搆';
 $labels['flagdeleted'] = '�く��罹勢';
 $labels['flaganswered'] = '�搗�況�物';
-$labels['flagflagged'] = '�像�亨�物';
+$labels['flagflagged'] = '�ｹ��ｰ懍揆 �ｶ緋ｰ��物';
 $labels['flagdraft'] = '�桷�亨 �ｳｴ�ｴ��物';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
+$labels['setvariable'] = '�ｳ���� �└���';
+$labels['setvarname'] = '�ｳ���俯ｪ�:';
+$labels['setvarvalue'] = '�ｳ���� �ｰ�:';
+$labels['setvarmodifiers'] = '��們享�梵:';
+$labels['varlower'] = '��誤ｬｸ�梵';
+$labels['varupper'] = '�劇�ｬｸ�梵';
+$labels['varlowerfirst'] = '�ｲｫ �ｬｸ�梵�･ｼ ��誤ｬｸ�梵�｡�';
+$labels['varupperfirst'] = '�ｲｫ �ｬｸ�梵�･ｼ �劇�ｬｸ�梵�｡�';
+$labels['varquotewildcard'] = '�柑��� �ｸｰ�从�･ｼ �攤�圸';
+$labels['varlength'] = '�ｸｸ�擽';
+$labels['notify'] = '�阜�ｦｼ �ｩ肥亨�ｧ� �ｳｴ�ざ�ｸｰ';
+$labels['notifyaddress'] = '�劇�メ �擽�ｩ肥攵 �｣ｼ���:';
+$labels['notifybody'] = '�阜�ｦｼ �ｩ肥亨�ｧ� �ｳｸ�ｬｸ:';
+$labels['notifysubject'] = '�阜�ｦｼ �ｩ肥亨�ｧ� ��罹ｪｩ:';
+$labels['notifyfrom'] = '�阜�ｦｼ �ｩ肥亨�ｧ� �ｰ懍侠�攤:';
+$labels['notifyimportance'] = '�､卓囈�巡:';
+$labels['notifyimportancelow'] = '�ぐ�搆';
+$labels['notifyimportancenormal'] = '�ｳｴ��ｵ';
+$labels['notifyimportancehigh'] = '��廷搆';
 $labels['filtercreate'] = '�符�┣ ��晧┳';
-$labels['usedata'] = '�符�┣�乱��� �共�搆�乱 �丶�株 �魂�擽�┣�･ｼ �ぎ�圸';
+$labels['usedata'] = '�符�┣�乱��� �共�搆 �魂�擽�┣�･ｼ �ぎ�圸:';
 $labels['nextstep'] = '�共�搆 �卿�ｳ�';
 $labels['...'] = '...';
-$labels['advancedopts'] = '�メ�┷ �└���';
+$labels['advancedopts'] = '�ｳ��ｸ� �└���';
 $labels['body'] = '�ｳｸ�ｬｸ';
 $labels['address'] = '�｣ｼ���';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
+$labels['envelope'] = '�ｴ駕握';
+$labels['modifier'] = '��們享�梵:';
 $labels['text'] = '��作侃�敢';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
+$labels['undecoded'] = '�部�从�剩�据�ｧ� �賦�搆 (�寳�メ���)';
+$labels['contenttype'] = '�ざ�圸 �悛���';
+$labels['modtype'] = '�悛���:';
+$labels['allparts'] = '�ｪｨ�草';
 $labels['domain'] = '�巡�ｩ肥攤';
-$labels['localpart'] = 'local part';
+$labels['localpart'] = '�｡懍ｻｬ �ｶ��ｶ�';
 $labels['user'] = '�ぎ�圸�梵';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = '�ｸｰ�ｳｸ�ｰ�';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['detail'] = '�┷�ｶ��ぎ�墳';
+$labels['comparator'] = '�ｹ��ｵ専ｸｰ:';
+$labels['default'] = '�ｸｰ�ｳｸ';
+$labels['octet'] = '�淀�ｲｩ (8�ｧ����)';
+$labels['asciicasemap'] = '�劇/��誤ｬｸ�梵 �ｵｬ�ｶ� (ascii-casemap)';
+$labels['asciinumeric'] = '�悪�梵 (ascii-numeric)';
 
 $messages = array();
-$messages['filterunknownerror'] = '�阜��� �螺�株 ��罹ｲ� �乱�洳.';
-$messages['filterconnerror'] = '��罹ｲ��乱 �硫�ｲｰ�腹 ��� �螺�慣�笈�共.';
-$messages['filterdeleteerror'] = '�符�┣�･ｼ �く��懦腹 ��� �螺�慣�笈�共. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['filterdeleted'] = '�符�┣�･ｼ �┳�ｳｵ����愍�｡� �く��� �物.';
-$messages['filtersaved'] = '�符�┣�･ｼ �┳�ｳｵ����愍�｡� ����棗 �物.';
-$messages['filtersaveerror'] = '�符�┣�･ｼ ����棗�腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['filterdeleteconfirm'] = '��簿ｧ尖｡� �│��晨復 �符�┣�攪 �く��罹･ｼ �寳�葺�強�笈�ｹ�?';
-$messages['ruledeleteconfirm'] = '�│��晨復 �ｷ懍ｹ呷揆 �く��懦葺�ｳ��梵 �葺�株 �ｲ��擽 �剳�共�鮒�笈�ｹ�?';
-$messages['actiondeleteconfirm'] = '�│��晨復 �徐�梠�揆 �く��懦葺�ｳ��梵 �葺�株 �ｲ��擽 �剳�共�鮒�笈�ｹ�?';
-$messages['forbiddenchars'] = '�符�糖�乱 �ｸ溢ｧ��頗 �ｬｸ�梵�ｰ� �梭�搆.';
-$messages['cannotbeempty'] = '�符�糖�株 �ｹ��牟�梭�揆 ��� �螺�搆.';
-$messages['ruleexist'] = '�ｧ���倣復 �擽�ｦ��攪 �符�┣�ｰ� �擽�ｯｸ �｡ｴ�椪 �物.';
-$messages['setactivateerror'] = '�│��晨復 �符�┣ �ｬｶ�搆�揆 �劈�┳�剩 �腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['setdeactivateerror'] = '�│��晨復 �符�┣ �ｬｶ�搆�揆 �ｹ��劈�┳�剩 �腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['setdeleteerror'] = '�│��晨復 �符�┣ �ｬｶ�搆�揆 �く��懦腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['setactivated'] = '�符�┣ �ｬｶ�搆�揆 �┳�ｳｵ����愍�｡� �劈�┳�剩 �葺����搆.';
-$messages['setdeactivated'] = '�符�┣ �ｬｶ�搆�揆 �┳�ｳｵ����愍�｡� �ｹ��劈�┳�剩 �葺����搆.';
-$messages['setdeleted'] = '�符�┣ �ｬｶ�搆�揆 �┳�ｳｵ����愍�｡� �く��� �物.';
-$messages['setdeleteconfirm'] = '�│��晨復 �符�┣ �ｬｶ�搆�揆 �ｧ��垈�ｳ��梵 �葺�株 �ｲ��擽 �剳�共�鮒�笈�ｹ�?';
-$messages['setcreateerror'] = '�符�┣ �ｬｶ�搆�揆 ��晧┳�腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['setcreated'] = '�符�┣ �ｬｶ�搆�揆 �┳�ｳｵ����愍�｡� ��晧┳ �物.';
-$messages['activateerror'] = '�│��晨復 �符�┣(�豆)�揆 �徐�梠�葺�ｲ� �腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['deactivateerror'] = '�│��晨復 �符�┣(�豆)�揆 �徐�梠�葺�ｧ� �賦�ｲ� �腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
-$messages['deactivated'] = '�符�┣(�豆)�揆 �徐�梠�葺�ｲ� �葺�株�魂 �┳�ｳｵ�葺����搆.';
-$messages['activated'] = '�符�┣(�豆)�揆 �徐�梠�葺�ｧ� �賦�ｲ� �葺�株�魂 �┳�ｳｵ�葺����搆.';
-$messages['moved'] = '�符�┣�･ｼ �擽�徐�葺�株 �魂 �┳�ｳｵ�葺����搆.';
-$messages['moveerror'] = '�│��晨復 �符�┣�･ｼ �擽�徐�腹 ��� �螺�搆. ��罹ｲ� �乱�洳 �ｰ懍�� �物.';
+$messages['filterunknownerror'] = '�阜��� �螺�株 ��罹ｲ� �丶�･�.';
+$messages['filterconnerror'] = '��罹ｲ��乱 �硫�ｲｰ�腹 ��� �螺�搆.';
+$messages['filterdeleteerror'] = '�符�┣�･ｼ �く��懦腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['filterdeleted'] = '�符�┣�ｰ� �┳�ｳｵ����愍�｡� �く��罹勢.';
+$messages['filtersaved'] = '�符�┣�ｰ� �┳�ｳｵ����愍�｡� ����棗�勢.';
+$messages['filtersaveerror'] = '�符�┣�･ｼ ����棗�腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['filterdeleteconfirm'] = '��簿ｧ尖｡� �│��晨復 �符�┣�･ｼ �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['ruledeleteconfirm'] = '��簿ｧ尖｡� �│��晨復 �ｷ懍ｹ呷揆 �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['actiondeleteconfirm'] = '��簿ｧ尖｡� �│��晨復 �徐�梠�揆 �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['forbiddenchars'] = '�符�糖�乱 �ｸ溢ｧ��頗 �ｬｸ�梵�ｰ� �｡ｴ�椪�物.';
+$messages['cannotbeempty'] = '�符�糖�株 �ｹ��寥�遭 ��� �螺�搆.';
+$messages['ruleexist'] = '�ｧ���倣復 �擽�ｦ��攪 �符�┣�ｰ� �擽�ｯｸ �｡ｴ�椪�物.';
+$messages['setactivateerror'] = '�│��晨復 �符�┣ �┷�敢�･ｼ �劈�┳�剩 �腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['setdeactivateerror'] = '�│��晨復 �符�┣ �┷�敢�･ｼ �ｹ��劈�┳�剩 �腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['setdeleteerror'] = '�│��晨復 �符�┣ �┷�敢�･ｼ �く��懦腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['setactivated'] = '�符�┣ �┷�敢�ｰ� �┳�ｳｵ����愍�｡� �劈�┳�剩�勢.';
+$messages['setdeactivated'] = '�符�┣ �┷�敢�ｰ� �┳�ｳｵ����愍�｡� �ｹ��劈�┳�剩�勢.';
+$messages['setdeleted'] = '�符�┣ �┷�敢�ｰ� �┳�ｳｵ����愍�｡� �く��罹勢.';
+$messages['setdeleteconfirm'] = '��簿ｧ尖｡� �│��晨復 �符�┣ �┷�敢�･ｼ �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['setcreateerror'] = '�符�┣ �┷�敢�･ｼ ��晧┳�腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['setcreated'] = '�符�┣ �┷�敢�ｰ� �┳�ｳｵ����愍�｡� ��晧┳�勢.';
+$messages['activateerror'] = '�│��晨復 �符�┣�･ｼ �劈�┳�剩�腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['deactivateerror'] = '�│��晨復 �符�┣�･ｼ �ｹ��劈�┳�剩�腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
+$messages['deactivated'] = '�符�┣�ｰ� �┳�ｳｵ����愍�｡� �ｹ��劈�┳�剩�勢.';
+$messages['activated'] = '�符�┣�ｰ� �┳�ｳｵ����愍�｡� �劈�┳�剩�勢.';
+$messages['moved'] = '�符�┣�ｰ� �┳�ｳｵ����愍�｡� �擽�徐�物.';
+$messages['moveerror'] = '�│��晨復 �符�┣�･ｼ �擽�徐�腹 ��� �螺�搆. ��罹ｲ� �丶�･俾ｰ� �ｰ懍�晨物.';
 $messages['nametoolong'] = '�擽�ｦ��擽 �ц�ｬｴ �ｹ�.';
 $messages['namereserved'] = '��溢平�頗 �擽�ｦ�.';
-$messages['setexist'] = '�ｬｶ�搆�擽 �擽�ｯｸ �｡ｴ�椪 �物.';
-$messages['nodata'] = '����牟�巡 �葺�ｘ�攪 �怱�ｹ俾ｰ� �│��晤据�牟�幣 �物!';
+$messages['setexist'] = '�┷�敢�ｰ� �擽�ｯｸ �｡ｴ�椪�物.';
+$messages['nodata'] = '�ｵ懍�� �葺�ｘ�攪 �怱�ｹ俾ｰ� �│��晤据�牟�幣 �鮒�笈�共!';
 
 ?>
diff --git a/plugins/managesieve/localization/lt_LT.inc b/plugins/managesieve/localization/lt_LT.inc
index d0a19cc62..8fafb6d8d 100644
--- a/plugins/managesieve/localization/lt_LT.inc
+++ b/plugins/managesieve/localization/lt_LT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Siuntﾄ曜as';
 $labels['recipient'] = 'Gavﾄ曜as';
 $labels['vacationaddresses'] = 'Papildomas gavﾄ曜ﾅｳ adresﾅｳ sﾄ�raﾅ｡as (skirti kableliais):';
 $labels['vacationdays'] = 'Kaip daﾅｾnai iﾅ｡siﾅｳsti laiﾅ｡kus (dienomis):';
+$labels['vacationinterval'] = 'Kaip daﾅｾnai siﾅｳsti laiﾅ｡kus:';
+$labels['days'] = 'd.';
+$labels['seconds'] = 'sek.';
 $labels['vacationreason'] = 'Laiﾅ｡ko tekstas';
 $labels['vacationsubject'] = 'Laiﾅ｡ko tema:';
 $labels['rulestop'] = 'Nutraukti taisykliﾅｳ vykdymﾄ�';
@@ -169,6 +172,6 @@ $messages['moveerror'] = 'Pasirinkto filtro perkelti neﾄｯmanoma. ﾄｮvyko serverio
 $messages['nametoolong'] = 'Vardas per ilgas.';
 $messages['namereserved'] = 'Rezervuotas vardas.';
 $messages['setexist'] = 'Rinkinys jau yra sukurtas.';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = 'Bﾅｫtina pasirinkti bent vienﾄ� pozicijﾄ�!';
 
 ?>
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index dc0d6fd75..f1f85c2e0 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sﾅｫtﾄｫtﾄ）s';
 $labels['recipient'] = 'Saﾅ�ﾄ杜ﾄ屠s';
 $labels['vacationaddresses'] = 'Ievadiet vienu vai vairﾄ〔us e-pastu(s), atdalot tos komatu:';
 $labels['vacationdays'] = 'Cik dienu laikﾄ� vienam un tam paﾅ｡am sﾅｫtﾄｫtﾄ）am neatbildﾄ鍍 atkﾄ〉toti (piem., 7):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Atvaﾄｼinﾄ）uma paziﾅ�ojuma teksts:';
 $labels['vacationsubject'] = 'Vﾄ都tules tﾄ杜a:';
 $labels['rulestop'] = 'Apturﾄ鍍 nosacﾄｫjumu pﾄ〉baudi';
diff --git a/plugins/managesieve/localization/ml_IN.inc b/plugins/managesieve/localization/ml_IN.inc
index 88c57da9d..67cd6829f 100644
--- a/plugins/managesieve/localization/ml_IN.inc
+++ b/plugins/managesieve/localization/ml_IN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = '犇�犇ｯ犇壟ｴｯ犇ｾ犇ｳ犒坂��';
 $labels['recipient'] = '犇ｸ犒財ｴｵ犒�犇歩ｴｰ犒坂�財ｴ､犒財ｴ､犇ｾ犇ｵ犒�';
 $labels['vacationaddresses'] = '犇ｸ犒財ｴｵ犒�犇歩ｴｰ犒坂�財ｴ､犒財ｴ､犇ｾ犇ｵ犇ｿ犇ｨ犒財ｴｱ犒� 犇�犇ｮ犒�犇ｯ犇ｿ犇ｲ犒坂�� 犇ｵ犇ｿ犇ｲ犇ｾ犇ｸ犇吭ｵ財ｴ吭ｴｳ犒≒ｴ游ｵ� 犇�犇ｧ犇ｿ犇歩ｴｮ犒≒ｴｳ犒財ｴｳ 犇ｪ犇游ｵ財ｴ游ｴｿ犇� (犇歩ｵ金ｴｮ犇ｯ犇ｿ犇游ｵ財ｴ游ｵ� 犇､犇ｿ犇ｰ犇ｿ犇壟ｵ財ｴ�)';
 $labels['vacationdays'] = '犇錫ｴ､犒財ｴｰ 犇ｭ犇ｿ犇ｵ犇ｸ犇� 犇歩ｵもｴ游ｵ≒ｴｮ犒財ｴｪ犒金ｴｳ犒坂�� 犇ｸ犇ｨ犒財ｴｦ犒�犇ｶ犇� 犇�犇ｯ犇歩ｵ財ｴ歩ｴ｣犇�:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '犇ｸ犇ｨ犒財ｴｦ犒�犇ｶ犇､犒財ｴ､犇ｿ犇ｨ犒財ｴｱ犒� 犇霞ｴｳ犒財ｴｳ犇游ｴ歩ｵ財ｴ歩ｴ� (犇�犇ｵ犇ｧ犇ｿ犇ｯ犒≒ｴ游ｵ� 犇歩ｴｾ犇ｰ犇｣犇�):';
 $labels['vacationsubject'] = '犇ｸ犇ｨ犒財ｴｦ犒�犇ｶ犇､犒財ｴ､犇ｿ犇ｨ犒財ｴｱ犒� 犇ｵ犇ｿ犇ｷ犇ｯ犇�:';
 $labels['rulestop'] = '犇ｨ犇ｿ犇ｯ犇ｮ犇吭ｵ財ｴ吭ｴｳ犒坂�� 犇ｵ犇ｿ犇ｲ犇ｯ犇ｿ犇ｰ犒≒ｴ､犒財ｴ､犒≒ｴｨ犒財ｴｨ犇､犒� 犇ｨ犇ｿ犇ｰ犒坂�財ｴ､犒財ｴ､犒≒ｴ�';
diff --git a/plugins/managesieve/localization/mr_IN.inc b/plugins/managesieve/localization/mr_IN.inc
index 20a99991b..3339737e0 100644
--- a/plugins/managesieve/localization/mr_IN.inc
+++ b/plugins/managesieve/localization/mr_IN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = '爨ｪ爭財､ｰ爭�爨ｷ爨�';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index 167283c81..c2c17b23c 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Avsender';
 $labels['recipient'] = 'Mottaker';
 $labels['vacationaddresses'] = 'Liste med mottakeradresser (adskilt med komma):';
 $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
+$labels['vacationinterval'] = 'Periode mellom meldinger:';
+$labels['days'] = 'dager';
+$labels['seconds'] = 'sekunder';
 $labels['vacationreason'] = 'Innhold (begrunnelse for fravﾃｦr)';
 $labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index e90eb2819..1fd6eee4e 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -18,7 +18,7 @@
 
 
 $labels['filters'] = 'Filters';
-$labels['managefilters'] = 'Beheer inkomende mail filters';
+$labels['managefilters'] = 'Beheer filters voor inkomende e-mail';
 $labels['filtername'] = 'Filternaam';
 $labels['newfilter'] = 'Nieuw filter';
 $labels['filteradd'] = 'Filter toevoegen';
@@ -43,7 +43,7 @@ $labels['filterover'] = 'over';
 $labels['addrule'] = 'Regel toevoegen';
 $labels['delrule'] = 'Regel verwijderen';
 $labels['messagemoveto'] = 'Verplaats bericht naar';
-$labels['messageredirect'] = 'Redirect bericht naar';
+$labels['messageredirect'] = 'Bericht doorsturen naar';
 $labels['messagecopyto'] = 'Kopieer bericht naar';
 $labels['messagesendcopy'] = 'Verstuur een kopie naar';
 $labels['messagereply'] = 'Beantwoord met bericht';
@@ -57,6 +57,9 @@ $labels['sender'] = 'Afzender';
 $labels['recipient'] = 'Ontvanger';
 $labels['vacationaddresses'] = 'Aanvullende lijst van geadresseerden (gescheiden met komma\'s):';
 $labels['vacationdays'] = 'Hoe vaak moet een bericht verstuurd worden (in dagen):';
+$labels['vacationinterval'] = 'Hoe vaak moet een bericht verstuurd worden:';
+$labels['days'] = 'dagen';
+$labels['seconds'] = 'seconden';
 $labels['vacationreason'] = 'Bericht (vakantiereden):';
 $labels['vacationsubject'] = 'Onderwerp:';
 $labels['rulestop'] = 'Stop met regels uitvoeren';
diff --git a/plugins/managesieve/localization/nn_NO.inc b/plugins/managesieve/localization/nn_NO.inc
index 9bb9a7c18..18bf8b987 100644
--- a/plugins/managesieve/localization/nn_NO.inc
+++ b/plugins/managesieve/localization/nn_NO.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Avsendar';
 $labels['recipient'] = 'Mottakar';
 $labels['vacationaddresses'] = 'Liste med mottakaradresser (komma-separert):';
 $labels['vacationdays'] = 'Periode mellom meldingar (i dagar):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Innhald (grunngjeving for frﾃ･vﾃｦr)';
 $labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index e3a530e62..9a6b70d8a 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Nadawca';
 $labels['recipient'] = 'Odbiorca';
 $labels['vacationaddresses'] = 'Lista dodatkowych adresﾃｳw odbiorcﾃｳw (oddzielonych przecinkami):';
 $labels['vacationdays'] = 'Czﾄ冱totliwoﾅ崙� wysyﾅＢnia wiadomoﾅ嫩i (w dniach):';
+$labels['vacationinterval'] = 'Jak czﾄ冱to wysyﾅＢﾄ� wiadomoﾅ嫩i:';
+$labels['days'] = 'dni';
+$labels['seconds'] = 'sekundy';
 $labels['vacationreason'] = 'Treﾅ崙� (przyczyna nieobecnoﾅ嫩i):';
 $labels['vacationsubject'] = 'Temat wiadomoﾅ嫩i:';
 $labels['rulestop'] = 'Przerwij przetwarzanie reguﾅ�';
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index a18ef1546..941119335 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatﾃ｡rio';
 $labels['vacationaddresses'] = 'Lista adicional de e-mails destinatﾃ｡rios (separado por vﾃｭrgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequﾃｪncia (em dias):';
+$labels['vacationinterval'] = 'Como geralmente enviam mensagens:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Corpo da mensagem (motivo de fﾃｩrias):';
 $labels['vacationsubject'] = 'Tﾃｭtulo da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index 375277ac2..bfb3f296a 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatﾃ｡rio';
 $labels['vacationaddresses'] = 'Lista adicional de destinatﾃ｡rios de e-mails (separados por vﾃｭrgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequﾃｪncia (em dias):';
+$labels['vacationinterval'] = 'Com que frequﾃｪncia envia mensagens:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Conteﾃｺdo da mensagem (motivo da ausﾃｪncia):';
 $labels['vacationsubject'] = 'Assunto da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
diff --git a/plugins/managesieve/localization/ro_RO.inc b/plugins/managesieve/localization/ro_RO.inc
index a619045a6..2c917cbdd 100644
--- a/plugins/managesieve/localization/ro_RO.inc
+++ b/plugins/managesieve/localization/ro_RO.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Expeditor';
 $labels['recipient'] = 'Destinatar';
 $labels['vacationaddresses'] = 'Adresele mele de e-mail adiﾈ嬖onale (ﾃｮmpﾄビﾈ嬖te cu virgulﾄ�):';
 $labels['vacationdays'] = 'Cﾃ｢t de des sﾄ� trimit mesajele (ﾃｮn zile):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpul mesajului (motivul vacanﾅ｣ei):';
 $labels['vacationsubject'] = 'Subiectul mesajului:';
 $labels['rulestop'] = 'Nu mai evalua reguli';
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index 47b139949..fb3f113c3 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'ﾐ樮ひｿﾑ�ﾐｰﾐｲﾐｸﾑひｵﾐｻﾑ�';
 $labels['recipient'] = 'ﾐ渙ｾﾐｻﾑτ�ﾐｰﾑひｵﾐｻﾑ�';
 $labels['vacationaddresses'] = 'ﾐ｡ﾐｿﾐｸﾑ�ﾐｾﾐｺ ﾐｼﾐｾﾐｸﾑ� ﾐｴﾐｾﾐｿﾐｾﾐｻﾐｽﾐｸﾑひｵﾐｻﾑ糊ｽﾑ錦� ﾐｰﾐｴﾑ�ﾐｵﾑ�ﾐｾﾐｲ (ﾑ�ﾐｰﾐｷﾐｴﾐｵﾐｻﾑ岱ｽﾐｽﾑ錦� ﾐｷﾐｰﾐｿﾑ肖び巾ｼﾐｸ):';
 $labels['vacationdays'] = 'ﾐ墟ｰﾐｺ ﾑ�ﾐｰﾑ�ﾑひｾ ﾐｾﾑひｿﾑ�ﾐｰﾐｲﾐｻﾑ肖び� ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ� (ﾐｲ ﾐｴﾐｽﾑ肖�):';
+$labels['vacationinterval'] = 'ﾐ墟ｰﾐｺ ﾑ�ﾐｰﾑ�ﾑひｾ ﾐｾﾑひｿﾑ�ﾐｰﾐｲﾐｻﾑ肖び� ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ�:';
+$labels['days'] = 'ﾐｴﾐｽﾐｵﾐｹ';
+$labels['seconds'] = 'ﾑ�ﾐｵﾐｺﾑσｽﾐｴ';
 $labels['vacationreason'] = 'ﾐ｢ﾐｵﾐｺﾑ�ﾑ� ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ� (ﾐｿﾑ�ﾐｸﾑ�ﾐｸﾐｽﾐｰ ﾐｾﾑび�ﾑτび�ﾑひｲﾐｸﾑ�):';
 $labels['vacationsubject'] = 'ﾐ｢ﾐｵﾐｼﾐｰ ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ�:';
 $labels['rulestop'] = 'ﾐ厘ｰﾐｺﾐｾﾐｽﾑ�ﾐｸﾑび� ﾐｲﾑ巾ｿﾐｾﾐｻﾐｽﾐｵﾐｽﾐｸﾐｵ';
diff --git a/plugins/managesieve/localization/si_LK.inc b/plugins/managesieve/localization/si_LK.inc
index 8a2856369..afc2e3851 100644
--- a/plugins/managesieve/localization/si_LK.inc
+++ b/plugins/managesieve/localization/si_LK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = '犖ｺ犢�犖ｱ犢癌ｶｱ犢�';
 $labels['recipient'] = '犖ｽ犖ｶ犖ｱ犢癌ｶｱ犢�';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = '犖ｴ犖ｫ犢亭ｷ�犢亭ｶｩ犖ｺ犢� 犖ｸ犢鐘ｶｭ犢倨ｶ壟ｷ鐘ｷ�:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index 81caec02d..f336cf2c5 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Odosielateﾄｾ';
 $labels['recipient'] = 'Adresﾃ｡t';
 $labels['vacationaddresses'] = 'Dodatoﾄ肱ﾃｭ prﾃｭjemcovia sprﾃ｡vy (oddelenﾃｭ ﾄ絞arkami):';
 $labels['vacationdays'] = 'Poﾄ稿t dnﾃｭ medzi odoslanﾃｭm sprﾃ｡vy:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Dﾃｴvod neprﾃｭtomnosti:';
 $labels['vacationsubject'] = 'Predmet sprﾃ｡vy:';
 $labels['rulestop'] = 'Koniec pravidiel';
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index eb37f5298..d9da8ab60 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Poﾅ｡iljatelj';
 $labels['recipient'] = 'Prejemnik';
 $labels['vacationaddresses'] = 'Dodaten seznam naslovov prejemnikov (loﾄ稿nih z vejico):';
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporoﾄ絞la poslana (v dnevih):';
+$labels['vacationinterval'] = 'Sporoﾄ絞la poﾅ｡lji na:';
+$labels['days'] = 'dni';
+$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Vsebina sporoﾄ絞la (vzrok za odsotnost):';
 $labels['vacationsubject'] = 'Zadeva sporoﾄ絞la';
 $labels['rulestop'] = 'Prekini z izvajanjem pravil';
@@ -99,14 +102,14 @@ $labels['setvariable'] = 'Nastavi spremenljivko';
 $labels['setvarname'] = 'Ime spremenljivke:';
 $labels['setvarvalue'] = 'Vrednost spremenljivke:';
 $labels['setvarmodifiers'] = 'Modifikator:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
+$labels['varlower'] = 'majhne ﾄ荒ke';
+$labels['varupper'] = 'velike ﾄ荒ke';
+$labels['varlowerfirst'] = 'prvi znak velika zaﾄ稿tnica';
 $labels['varupperfirst'] = 'prvi znak velika zaﾄ稿tnica';
 $labels['varquotewildcard'] = 'citiraj posebne znake';
 $labels['varlength'] = 'dolﾅｾina';
 $labels['notify'] = 'Poﾅ｡tlji obvestilo';
-$labels['notifyaddress'] = 'To e-mail address:';
+$labels['notifyaddress'] = 'Na elektronski naslov:';
 $labels['notifybody'] = 'Telo obvestila:';
 $labels['notifysubject'] = 'Zadeva obvestila:';
 $labels['notifyfrom'] = 'Poﾅ｡iljatelj obvestila:';
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index 50749e6ff..49d5b1222 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Avsﾃ､ndare';
 $labels['recipient'] = 'Mottagare';
 $labels['vacationaddresses'] = 'Ytterligare mottagaradresser (avdelade med kommatecken)';
 $labels['vacationdays'] = 'Antal dagar mellan auto-svar:';
+$labels['vacationinterval'] = 'Tid mellan auto-svar:';
+$labels['days'] = 'Dagar';
+$labels['seconds'] = 'Sekunder';
 $labels['vacationreason'] = 'Meddelande i auto-svar:';
 $labels['vacationsubject'] = 'Meddelandeﾃ､mne:';
 $labels['rulestop'] = 'Avsluta filtrering';
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index 1c12661ca..c36869d29 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Gﾃｶnderici';
 $labels['recipient'] = 'Alﾄｱcﾄｱ';
 $labels['vacationaddresses'] = 'ﾄｰlave e-posta adreslerim(virgﾃｼl ile ayrﾄｱlmﾄｱﾅ�)';
 $labels['vacationdays'] = 'Ne sﾄｱklﾄｱkla mesajlar gﾃｶnderilir(gﾃｼn)';
+$labels['vacationinterval'] = 'Ne kadar sﾄｱklﾄｱkla mesaj gﾃｶnderirsiniz:';
+$labels['days'] = 'gﾃｼnler';
+$labels['seconds'] = 'saniyeler';
 $labels['vacationreason'] = 'Mesaj gﾃｶvdesi(tatil sebebi):';
 $labels['vacationsubject'] = 'Mesaj konusu:';
 $labels['rulestop'] = 'Kurallarﾄｱ deﾄ歹rlendirmeyi bitir';
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index 476341834..41623df35 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'ﾐ柘孟ｴﾐｿﾑ�ﾐｰﾐｲﾐｽﾐｸﾐｺ';
 $labels['recipient'] = 'ﾐ樮び�ﾐｸﾐｼﾑσｲﾐｰﾑ�';
 $labels['vacationaddresses'] = 'ﾐ頒ｾﾐｴﾐｰﾑひｺﾐｾﾐｲﾐｸﾐｹ ﾑ�ﾐｿﾐｸﾑ�ﾐｾﾐｺ ﾐｰﾐｴﾑ�ﾐｵﾑ� ﾐｾﾑび�ﾐｸﾐｼﾑσｲﾐｰﾑ�ﾑ孟ｲ (ﾑ�ﾐｾﾐｷﾐｴﾑ孟ｻﾐｵﾐｽﾐｸﾑ� ﾐｺﾐｾﾐｼﾐｾﾑ�)';
 $labels['vacationdays'] = 'ﾐｯﾐｺ ﾑ�ﾐｰﾑ�ﾑひｾ ﾐｿﾐｾﾐｲﾑひｾﾑ�ﾑ社ｲﾐｰﾑひｸ (ﾑ� ﾐｴﾐｽﾑ肖�):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'ﾐ｢ﾐｵﾐｺﾑ�ﾑ� ﾐｿﾐｾﾐｲﾑ孟ｴﾐｾﾐｼﾐｻﾐｵﾐｽﾐｽﾑ�:';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'ﾐ林σｿﾐｸﾐｽﾐｸﾑひｸ ﾐｿﾐｵﾑ�ﾐｵﾐｲﾑ毛�ﾐｺﾑ� ﾐｿﾑ�ﾐｰﾐｲﾐｸﾐｻ';
diff --git a/plugins/managesieve/localization/vi_VN.inc b/plugins/managesieve/localization/vi_VN.inc
index fbb39b648..0a4ce6e82 100644
--- a/plugins/managesieve/localization/vi_VN.inc
+++ b/plugins/managesieve/localization/vi_VN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Ngﾆｰ盻拱 g盻ｭi';
 $labels['recipient'] = 'Ngﾆｰ盻拱 nh蘯ｭn';
 $labels['vacationaddresses'] = 'ﾄ雪ｻ蟻 ch盻� email b盻� sung c盻ｧa tﾃｴi ( phﾃ｢n cﾃ｡ch b蘯ｱng d蘯･u ph蘯ｩy)';
 $labels['vacationdays'] = 'S盻� l蘯ｧn g盻ｭi thﾆｰ (trong ngﾃ�y)';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'N盻冓 dung chﾃｭnh';
 $labels['vacationsubject'] = 'Tiﾃｪu ﾄ黛ｻ� thﾆｰ';
 $labels['rulestop'] = 'Ng盻ｫng ﾄ妥｡nh giﾃ｡ qui lu蘯ｭt';
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index b3b09ecee..79b705c54 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -35,29 +35,32 @@ $labels['filterisnot'] = '荳咲ｭ我ｺ�';
 $labels['filterexists'] = '蟄伜惠';
 $labels['filternotexists'] = '荳榊ｭ伜惠';
 $labels['filtermatches'] = '蛹ｹ驟崎｡ｨ霎ｾ蠑�';
-$labels['filternotmatches'] = '譌�蛹ｹ驟咲噪陦ｨ霎ｾ蠑�';
+$labels['filternotmatches'] = '荳榊源驟崎｡ｨ霎ｾ蠑�';
 $labels['filterregex'] = '蛹ｹ驟肴ｭ｣蛻呵｡ｨ霎ｾ蠑�';
-$labels['filternotregex'] = '譌�蛹ｹ驟咲噪豁｣蛻呵｡ｨ霎ｾ蠑�';
+$labels['filternotregex'] = '荳榊源驟肴ｭ｣蛻呵｡ｨ霎ｾ蠑�';
 $labels['filterunder'] = '蟆丈ｺ�';
 $labels['filterover'] = '螟ｧ莠�';
-$labels['addrule'] = '豺ｻ蜉�隗�蛻�';
+$labels['addrule'] = '譁ｰ蟒ｺ隗�蛻�';
 $labels['delrule'] = '蛻�髯､隗�蛻�';
 $labels['messagemoveto'] = '蟆�驍ｮ莉ｶ遘ｻ閾ｳ';
 $labels['messageredirect'] = '蟆�驍ｮ莉ｶ霓ｬ蜿題�ｳ';
 $labels['messagecopyto'] = '螟榊宛驍ｮ莉ｶ閾ｳ';
 $labels['messagesendcopy'] = '蜿鷹�∝､榊宛驍ｮ莉ｶ閾ｳ';
-$labels['messagereply'] = '蝗槫､堺ｻ･荳倶ｿ｡諱ｯ';
+$labels['messagereply'] = '蝗槫､堺ｻ･荳句��螳ｹ';
 $labels['messagedelete'] = '蛻�髯､驍ｮ莉ｶ';
-$labels['messagediscard'] = '闊榊ｼ�驍ｮ莉ｶ蟷ｶ蝗槫､堺ｻ･荳倶ｿ｡諱ｯ';
-$labels['messagesrules'] = '蟇ｹ謾ｶ蜿也噪驍ｮ莉ｶ蠎皮畑隗�蛻呻ｼ�';
-$labels['messagesactions'] = '...謇ｧ陦御ｻ･荳句勘菴懶ｼ�';
+$labels['messagediscard'] = '闊榊ｼ�驍ｮ莉ｶ蟷ｶ蝗槫､堺ｻ･荳句��螳ｹ';
+$labels['messagesrules'] = '蟇ｹ譁ｰ謾ｶ蜿也噪驍ｮ莉ｶ蠎皮畑隗�蛻呻ｼ�';
+$labels['messagesactions'] = '謇ｧ陦御ｻ･荳区桃菴懶ｼ�';
 $labels['add'] = '豺ｻ蜉�';
 $labels['del'] = '蛻�髯､';
 $labels['sender'] = '蜿台ｻｶ莠ｺ';
 $labels['recipient'] = '謾ｶ莉ｶ莠ｺ';
-$labels['vacationaddresses'] = '謾ｶ莉ｶ莠ｺ蝨ｰ蝮�逧�髯�蜉�蜷榊黒�ｼ井ｻ･騾怜捷蛻�髫費ｼ�';
-$labels['vacationdays'] = '蜿鷹��驍ｮ莉ｶ鬚醍紫(螟ｩ謨ｰ):';
-$labels['vacationreason'] = '驍ｮ莉ｶ豁｣譁�(莨大∞蜴溷屏)';
+$labels['vacationaddresses'] = '謾ｶ莉ｶ莠ｺ蝨ｰ蝮�逧�髯�蜉�蜷榊黒�ｼ井ｻ･蜊願ｧ帝�怜捷蛻�髫費ｼ�';
+$labels['vacationdays'] = '蜿鷹��驍ｮ莉ｶ鬚醍紫(蜊穂ｽ搾ｼ壼､ｩ):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = '驍ｮ莉ｶ豁｣譁�(蛛�譛溷次蝗�)';
 $labels['vacationsubject'] = '驍ｮ莉ｶ荳ｻ鬚�';
 $labels['rulestop'] = '蛛懈ｭ｢隸�莉ｷ隗�蛻�';
 $labels['enable'] = '蜷ｯ逕ｨ/遖∫畑';
@@ -70,11 +73,11 @@ $labels['filtersetdeact'] = '蛛懃畑蠖灘燕逧�霑�貊､蝎ｨ隶ｾ鄂ｮ髮�';
 $labels['filterdef'] = '霑�貊､蝎ｨ螳壻ｹ�';
 $labels['filtersetname'] = '霑�貊､蝎ｨ髮�逧�蜷咲ｧｰ';
 $labels['newfilterset'] = '譁ｰ逧�霑�貊､蝎ｨ髮�';
-$labels['active'] = '豢ｻ蜉ｨ';
+$labels['active'] = '蜷ｯ逕ｨ';
 $labels['none'] = '譌�';
-$labels['fromset'] = '莉手ｮｾ鄂ｮ';
+$labels['fromset'] = '莉手ｮｾ鄂ｮ髮�';
 $labels['fromfile'] = '莉取枚莉ｶ';
-$labels['filterdisabled'] = '遖∫畑霑�貊､蝎ｨ';
+$labels['filterdisabled'] = '霑�貊､蝎ｨ蟾ｲ遖∫畑';
 $labels['countisgreaterthan'] = '隶｡謨ｰ螟ｧ莠�';
 $labels['countisgreaterthanequal'] = '隶｡謨ｰ螟ｧ莠取�也ｭ我ｺ�';
 $labels['countislessthan'] = '隶｡謨ｰ蟆丈ｺ�';
@@ -90,7 +93,7 @@ $labels['valuenotequals'] = '蛟ｼ荳咲ｭ我ｺ�';
 $labels['setflags'] = '隶ｾ螳夐ぐ莉ｶ逧�譬�隸�';
 $labels['addflags'] = '蠅槫刈驍ｮ莉ｶ逧�譬�隸�';
 $labels['removeflags'] = '蛻�髯､驍ｮ莉ｶ逧�譬�隸�';
-$labels['flagread'] = '髦�隸ｻ';
+$labels['flagread'] = '隸ｻ蜿�';
 $labels['flagdeleted'] = '蛻�髯､';
 $labels['flaganswered'] = '蟾ｲ遲泌､�';
 $labels['flagflagged'] = '蟾ｲ譬�隶ｰ';
@@ -98,26 +101,26 @@ $labels['flagdraft'] = '闕臥ｨｿ';
 $labels['setvariable'] = '隶ｾ鄂ｮ蜿倬��';
 $labels['setvarname'] = '蜿倬�丞錐�ｼ�';
 $labels['setvarvalue'] = '蛟ｼ�ｼ�';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
+$labels['setvarmodifiers'] = '菫ｮ謾ｹ�ｼ�';
+$labels['varlower'] = '蟆丞��';
+$labels['varupper'] = '螟ｧ蜀�';
+$labels['varlowerfirst'] = '鬥門ｭ玲ｯ榊ｰ丞��';
+$labels['varupperfirst'] = '鬥門ｭ玲ｯ榊､ｧ蜀�';
+$labels['varquotewildcard'] = '蠑慕畑迚ｹ谿雁ｭ礼ｬｦ';
 $labels['varlength'] = '髟ｿ蠎ｦ';
 $labels['notify'] = '蜿鷹��騾夂衍';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
+$labels['notifyaddress'] = '謾ｶ莉ｶ蝨ｰ蝮��ｼ�';
+$labels['notifybody'] = '騾夂衍豁｣譁��ｼ�';
 $labels['notifysubject'] = '騾夂衍荳ｻ鬚�';
-$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifyfrom'] = '騾夂衍逧�蜿鷹�∽ｺｺ�ｼ�';
 $labels['notifyimportance'] = '莨伜�育ｺｧ�ｼ�';
 $labels['notifyimportancelow'] = '菴�';
 $labels['notifyimportancenormal'] = '荳ｭ';
 $labels['notifyimportancehigh'] = '鬮�';
-$labels['filtercreate'] = '蛻帛ｻｺ霑�貊､蝎ｨ';
-$labels['usedata'] = '蝨ｨ霑�貊､蝎ｨ荳ｭ菴ｿ逕ｨ莉･荳区焚謐ｮ';
+$labels['filtercreate'] = '蛻帛ｻｺ霑�貊､隗�蛻�';
+$labels['usedata'] = '蝨ｨ霑�貊､蝎ｨ荳ｭ菴ｿ逕ｨ荳句�玲焚謐ｮ';
 $labels['nextstep'] = '荳倶ｸ�豁･';
-$labels['...'] = '窶ｦ窶ｦ';
+$labels['...'] = '...';
 $labels['advancedopts'] = '鬮倡ｺｧ騾蛾｡ｹ';
 $labels['body'] = '豁｣譁�';
 $labels['address'] = '蝨ｰ蝮�';
@@ -134,41 +137,41 @@ $labels['user'] = '逕ｨ謌ｷ';
 $labels['detail'] = '扈�闃�';
 $labels['comparator'] = '豈碑ｾ��ｼ�';
 $labels['default'] = '鮟倩ｮ､';
-$labels['octet'] = '荳･譬ｼ逧��ｼ亥ｭ苓鰍�ｼ�';
-$labels['asciicasemap'] = '荳榊玄蛻�螟ｧ蟆丞�呻ｼ�ascii蟄礼ｬｦ�ｼ�';
-$labels['asciinumeric'] = '謨ｰ蟄暦ｼ�ascii謨ｰ蟄暦ｼ�';
+$labels['octet'] = '荳･譬ｼ讓｡蠑�(蟄苓鰍)';
+$labels['asciicasemap'] = '荳榊玄蛻�螟ｧ蟆丞��(ascii 蟄礼ｬｦ)';
+$labels['asciinumeric'] = '謨ｰ蟄礼ｱｻ蝙�(ascii 謨ｰ蟄�)';
 
 $messages = array();
 $messages['filterunknownerror'] = '譛ｪ遏･逧�譛榊苅蝎ｨ髞呵ｯｯ';
-$messages['filterconnerror'] = '譌�豕戊ｿ樊磁蛻ｰ managesieve 譛榊苅蝎ｨ';
-$messages['filterdeleteerror'] = '譌�豕募唖髯､霑�貊､蝎ｨ縲よ恪蜉｡蝎ｨ髞呵ｯｯ';
+$messages['filterconnerror'] = '譌�豕戊ｿ樊磁閾ｳ譛榊苅蝎ｨ';
+$messages['filterdeleteerror'] = '譌�豕募唖髯､霑�貊､蝎ｨ縲よ恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ';
 $messages['filterdeleted'] = '霑�貊､蝎ｨ蟾ｲ謌仙粥蛻�髯､';
 $messages['filtersaved'] = '霑�貊､蝎ｨ蟾ｲ謌仙粥菫晏ｭ倥��';
-$messages['filtersaveerror'] = '譌�豕穂ｿ晏ｭ倩ｿ�貊､蝎ｨ縲よ恪蜉｡蝎ｨ髞呵ｯｯ';
+$messages['filtersaveerror'] = '譌�豕穂ｿ晏ｭ倩ｿ�貊､蝎ｨ縲よ恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ';
 $messages['filterdeleteconfirm'] = '謔ｨ遑ｮ螳夊ｦ∝唖髯､謇�騾画叫逧�霑�貊､蝎ｨ蜷暦ｼ�';
 $messages['ruledeleteconfirm'] = '謔ｨ遑ｮ螳夊ｦ∝唖髯､謇�騾画叫逧�隗�蛻吝雛�ｼ�';
-$messages['actiondeleteconfirm'] = '謔ｨ遑ｮ螳夊ｦ∝唖髯､謇�騾画叫逧�蜉ｨ菴懷雛�ｼ�';
-$messages['forbiddenchars'] = '蜀�螳ｹ荳ｭ蛹�蜷ｫ遖∫畑逧�蟄礼ｬｦ';
+$messages['actiondeleteconfirm'] = '謔ｨ遑ｮ螳夊ｦ∝唖髯､謇�騾画叫逧�謫堺ｽ懷雛�ｼ�';
+$messages['forbiddenchars'] = '蜀�螳ｹ蛹�蜷ｫ遖∫畑蟄礼ｬｦ';
 $messages['cannotbeempty'] = '蜀�螳ｹ荳崎�ｽ荳ｺ遨ｺ';
 $messages['ruleexist'] = '謖�螳夊ｿ�貊､蝎ｨ蜷咲ｧｰ蟾ｲ蟄伜惠縲�';
-$messages['setactivateerror'] = '譌�豕募星逕ｨ謖�螳夊ｿ�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ髞呵ｯｯ縲�';
-$messages['setdeactivateerror'] = '譌�豕募●逕ｨ謖�螳夊ｿ�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ髞呵ｯｯ縲�';
-$messages['setdeleteerror'] = '譌�豕募唖髯､謖�螳夊ｿ�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ髞呵ｯｯ縲�';
-$messages['setactivated'] = '霑�貊､蝎ｨ謌仙粥蜷ｯ逕ｨ縲�';
-$messages['setdeactivated'] = '霑�貊､蝎ｨ謌仙粥蛛懃畑縲�';
-$messages['setdeleted'] = '霑�貊､蝎ｨ謌仙粥蛻�髯､縲�';
-$messages['setdeleteconfirm'] = '菴�遑ｮ螳夊ｦ∝唖髯､謖�螳夊ｿ�貊､蝎ｨ�ｼ�';
-$messages['setcreateerror'] = '譌�豕募�帛ｻｺ霑�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ髞呵ｯｯ縲�';
+$messages['setactivateerror'] = '譌�豕募星逕ｨ謖�螳夊ｿ�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ縲�';
+$messages['setdeactivateerror'] = '譌�豕募●逕ｨ謖�螳夊ｿ�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ縲�';
+$messages['setdeleteerror'] = '譌�豕募唖髯､謖�螳夊ｿ�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ縲�';
+$messages['setactivated'] = '蜷ｯ逕ｨ霑�貊､蝎ｨ髮�謌仙粥縲�';
+$messages['setdeactivated'] = '遖∫畑霑�貊､蝎ｨ髮�謌仙粥縲�';
+$messages['setdeleted'] = '蛻�髯､霑�貊､蝎ｨ謌仙粥縲�';
+$messages['setdeleteconfirm'] = '謔ｨ遑ｮ螳夊ｦ∝唖髯､謖�螳夂噪霑�貊､蝎ｨ蜷暦ｼ�';
+$messages['setcreateerror'] = '譌�豕募�帛ｻｺ霑�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ縲�';
 $messages['setcreated'] = '霑�貊､蝎ｨ謌仙粥蛻帛ｻｺ縲�';
-$messages['activateerror'] = '譌�豕募星逕ｨ騾我ｸｭ逧�霑�貊､蝎ｨ�ｼ悟屏荳ｺ譛榊苅蝎ｨ蜿醍函髞呵ｯｯ縲�';
-$messages['deactivateerror'] = '譌�豕慕ｦ∫畑騾我ｸｭ逧�霑�貊､蝎ｨ�ｼ悟屏荳ｺ譛榊苅蝎ｨ蜿醍函髞呵ｯｯ縲�';
+$messages['activateerror'] = '譌�豕募星逕ｨ騾我ｸｭ逧�霑�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ縲�';
+$messages['deactivateerror'] = '譌�豕慕ｦ∫畑騾我ｸｭ逧�霑�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ縲�';
 $messages['deactivated'] = '蜷ｯ逕ｨ霑�貊､蝎ｨ謌仙粥縲�';
 $messages['activated'] = '遖∫畑霑�貊､蝎ｨ謌仙粥縲�';
-$messages['moved'] = '霑�貊､蝎ｨ遘ｻ蜉ｨ謌仙粥縲�';
-$messages['moveerror'] = '譌�豕慕ｧｻ蜉ｨ騾我ｸｭ逧�霑�貊､蝎ｨ�ｼ悟屏荳ｺ譛榊苅蝎ｨ蜿醍函髞呵ｯｯ縲�';
-$messages['nametoolong'] = '蜷咲ｧｰ螟ｪ髟ｿ縲�';
-$messages['namereserved'] = 'Reserved name.';
+$messages['moved'] = '遘ｻ蜉ｨ霑�貊､蝎ｨ謌仙粥縲�';
+$messages['moveerror'] = '譌�豕慕ｧｻ蜉ｨ騾我ｸｭ逧�霑�貊､蝎ｨ�ｼ梧恪蜉｡蝎ｨ蜿醍函髞呵ｯｯ縲�';
+$messages['nametoolong'] = '譌�豕募�帛ｻｺ霑�貊､蝎ｨ髮��ｼ悟錐遘ｰ螟ｪ髟ｿ縲�';
+$messages['namereserved'] = '菫晉蕗蜷咲ｧｰ縲�';
 $messages['setexist'] = '隶ｾ鄂ｮ蟾ｲ蟄伜惠縲�';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = '閾ｳ蟆鷹�画叫荳�荳ｪ菴咲ｽｮ�ｼ�';
 
 ?>
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index cee1d1abd..3f3fc1313 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -57,12 +57,15 @@ $labels['sender'] = '蟇�莉ｶ閠�';
 $labels['recipient'] = '謾ｶ莉ｶ閠�';
 $labels['vacationaddresses'] = '蜈ｶ莉匁噺莉ｶ閠��ｼ育畑蜊雁ｽ｢騾苓辧髫秘幕�ｼ会ｼ�';
 $labels['vacationdays'] = '螟壻ｹ�蝗櫁ｦ�荳�谺｡�ｼ亥粍菴搾ｼ壼､ｩ�ｼ会ｼ�';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '菫｡莉ｶ蜈ｧ螳ｹ�ｼ井ｼ大∞蜴溷屏�ｼ会ｼ�';
 $labels['vacationsubject'] = '險頑�ｯ荳ｻ譌ｨ:';
 $labels['rulestop'] = '蛛懈ｭ｢隧穂ｼｰ隕丞援';
 $labels['enable'] = '蝠溽畑/蛛懃畑';
 $labels['filterset'] = '遽ｩ驕ｸ蝎ｨ髮�蜷�';
-$labels['filtersets'] = 'Filter sets';
+$labels['filtersets'] = '遽ｩ驕ｸ蝎ｨ髮�蜷�';
 $labels['filtersetadd'] = '蜉�蜈･遽ｩ驕ｸ蝎ｨ髮�蜷�';
 $labels['filtersetdel'] = '蛻ｪ髯､逶ｮ蜑咲噪遽ｩ驕ｸ蝎ｨ髮�蜷�';
 $labels['filtersetact'] = '蝠溽畑逶ｮ蜑咲噪遽ｩ驕ｸ蝎ｨ髮�蜷�';
@@ -92,13 +95,13 @@ $labels['addflags'] = '譁ｰ蠅樊ｨ呵ｨ伜芦險頑�ｯ';
 $labels['removeflags'] = '遘ｻ髯､險頑�ｯ讓呵ｨ�';
 $labels['flagread'] = '隶�蜿�';
 $labels['flagdeleted'] = '蛻ｪ髯､';
-$labels['flaganswered'] = 'Answered';
+$labels['flaganswered'] = '蟾ｲ邯灘屓隕�';
 $labels['flagflagged'] = '蟾ｲ蜉�讓呵ｨ倡噪驛ｵ莉ｶ';
 $labels['flagdraft'] = '闕臥ｨｿ';
 $labels['setvariable'] = '險ｭ螳夊ｮ頑丙';
 $labels['setvarname'] = '隶頑丙蜷咲ｨｱ:';
 $labels['setvarvalue'] = '隶頑丙蛟ｼ:';
-$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['setvarmodifiers'] = '菫ｮ謾ｹ:';
 $labels['varlower'] = '菴取名';
 $labels['varupper'] = '鬮俶名';
 $labels['varlowerfirst'] = '隨ｬ荳�蛟句ｭ嶺ｽ取名';
@@ -121,8 +124,8 @@ $labels['...'] = '窶ｦ';
 $labels['advancedopts'] = '騾ｲ髫朱∈鬆�';
 $labels['body'] = '蜈ｧ譁�';
 $labels['address'] = '驛ｵ莉ｶ菴榊捩';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
+$labels['envelope'] = '菫｡蟆�';
+$labels['modifier'] = '菫ｮ謾ｹ:';
 $labels['text'] = '譁�蟄�';
 $labels['undecoded'] = '譛ｪ隗｣遒ｼ(raw)';
 $labels['contenttype'] = '蜈ｧ螳ｹ鬘槫梛';
@@ -134,9 +137,9 @@ $labels['user'] = '菴ｿ逕ｨ閠�';
 $labels['detail'] = '邏ｰ遽�';
 $labels['comparator'] = '豈碑ｼ�:';
 $labels['default'] = '鬆占ｨｭ';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['octet'] = '蝴ｴ隰ｹ讓｡蠑�(蜈ｫ菴榊��邨�)';
+$labels['asciicasemap'] = '荳榊項蛻�螟ｧ蟆丞ｯｫ(謗｡逕ｨASCII-Casemap)';
+$labels['asciinumeric'] = '謨ｸ蟄鈴｡槫梛(ascii-numeric)';
 
 $messages = array();
 $messages['filterunknownerror'] = '譛ｪ遏･逧�莨ｺ譛榊勣骭ｯ隱､';
@@ -167,8 +170,8 @@ $messages['activated'] = '遽ｩ驕ｸ蝎ｨ蟾ｲ蛛懃畑';
 $messages['moved'] = '遽ｩ驕ｸ蝎ｨ蟾ｲ遘ｻ蜍�';
 $messages['moveerror'] = '辟｡豕慕ｧｻ蜍暮∈謫�逧�遽ｩ驕ｸ蝎ｨ縲ゆｼｺ譛榊勣骭ｯ隱､';
 $messages['nametoolong'] = '辟｡豕募ｻｺ遶狗ｯｩ驕ｸ蝎ｨ髮�蜷医�� 蜷咲ｨｱ螟ｪ髟ｷ';
-$messages['namereserved'] = 'Reserved name.';
+$messages['namereserved'] = '菫晉蕗蜷咲ｨｱ.';
 $messages['setexist'] = '險ｭ螳壼ｷｲ蟄伜惠';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = '閾ｳ蟆題ｦ�驕ｸ謫�荳�蛟倶ｽ咲ｽｮ';
 
 ?>
diff --git a/plugins/markasjunk/localization/el_GR.inc b/plugins/markasjunk/localization/el_GR.inc
index 78cfaf060..fb16a29ce 100644
--- a/plugins/markasjunk/localization/el_GR.inc
+++ b/plugins/markasjunk/localization/el_GR.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['buttontext'] = 'Junk';
+$labels['buttontext'] = 'ﾎ対ｽﾎｵﾏ�ﾎｹﾎｸﾏ歳ｼﾎｷﾏ�ﾎｱ';
 $labels['buttontitle'] = 'ﾎ｣ﾎｮﾎｼﾎｱﾎｽﾏπｷ ﾏ珂� ﾎ対ｽﾎｵﾏ�ﾎｹﾎｸﾏ歳ｼﾎｷﾏ�ﾎｿﾏ�';
 $labels['reportedasjunk'] = 'ﾎ対ｽﾎｱﾏ�ﾎｭﾏ∃ｸﾎｷﾎｺﾎｵ ﾏ珂� ﾎ対ｽﾎｵﾏ�ﾎｹﾎｸﾎｮﾎｼﾎｷﾏ�ﾎｿ';
 
diff --git a/plugins/markasjunk/localization/gl_ES.inc b/plugins/markasjunk/localization/gl_ES.inc
index dd0c0ad40..d2a9e98b7 100644
--- a/plugins/markasjunk/localization/gl_ES.inc
+++ b/plugins/markasjunk/localization/gl_ES.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['buttontext'] = 'Junk';
+$labels['buttontext'] = 'Correo lixo';
 $labels['buttontitle'] = 'Marcar como correo lixo';
 $labels['reportedasjunk'] = 'Mensaxe marcada como correo lixo';
 
diff --git a/plugins/new_user_dialog/localization/ko_KR.inc b/plugins/new_user_dialog/localization/ko_KR.inc
index 82240f37d..d9b519475 100644
--- a/plugins/new_user_dialog/localization/ko_KR.inc
+++ b/plugins/new_user_dialog/localization/ko_KR.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = '��們侠�梵�攪 �侠�寳�揆 �ｱ��垈�ｸｰ �ｰ罷檮�笈�共.';
-$labels['identitydialoghint'] = '�擽 �ｰ菩侃�株 �ｵ懍ｴ壱｡� �｡懋ｷｸ�攤�腹 �阜�ｧ� �ｘ�ム�か�笈�共.';
+$labels['identitydialogtitle'] = '��們侠�攤�攪 �侠�寳�揆 �刋�┳�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$labels['identitydialoghint'] = '�擽 �メ�梵�株 �ｵ懍ｴ壱｡� �｡懋ｷｸ�攤�腹 �阜�ｧ� �ｘ�ム�か�笈�共.';
 
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/nl_NL.inc b/plugins/new_user_dialog/localization/nl_NL.inc
index 4d5d41185..c5d392f98 100644
--- a/plugins/new_user_dialog/localization/nl_NL.inc
+++ b/plugins/new_user_dialog/localization/nl_NL.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = 'Vul uw correcte identiteitgegevens in a.u.b.';
-$labels['identitydialoghint'] = 'Dit scherm verschijnt enkel bij uw eerste login.';
+$labels['identitydialogtitle'] = 'Vul alstublieft uw afzendergegevens in.';
+$labels['identitydialoghint'] = 'Dit scherm verschijnt eenmalig bij uw eerste aanmelding.';
 
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/zh_CN.inc b/plugins/new_user_dialog/localization/zh_CN.inc
index 99b2de701..ca40173af 100644
--- a/plugins/new_user_dialog/localization/zh_CN.inc
+++ b/plugins/new_user_dialog/localization/zh_CN.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = '隸ｷ蝪ｫ蜀吝書騾∬��譬�隸�';
+$labels['identitydialogtitle'] = '隸ｷ蝪ｫ蜀吝書騾∽ｺｺ霄ｫ莉ｽ';
 $labels['identitydialoghint'] = '譛ｬ謠千､ｺ莉�蝨ｨ隨ｬ荳�谺｡逋ｻ蠖墓慮譏ｾ遉ｺ縲�';
 
 ?>
\ No newline at end of file
diff --git a/plugins/newmail_notifier/localization/gl_ES.inc b/plugins/newmail_notifier/localization/gl_ES.inc
index 6c1129b31..8d105531e 100644
--- a/plugins/newmail_notifier/localization/gl_ES.inc
+++ b/plugins/newmail_notifier/localization/gl_ES.inc
@@ -16,14 +16,14 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels['basic'] = 'Display browser notifications on new message';
-$labels['desktop'] = 'Display desktop notifications on new message';
-$labels['sound'] = 'Play the sound on new message';
+$labels['basic'] = 'Amosar notificaciﾃｳns no navegador cando entre unha mensaxe nova';
+$labels['desktop'] = 'Amosar notificaciﾃｳns no escritorio cando chegue unha mensaxe nova';
+$labels['sound'] = 'Tocar un son cando chegue unha mensaxe nova';
 $labels['test'] = 'Proba';
 $labels['title'] = 'Novo Correo!';
-$labels['body'] = 'You\'ve received a new message.';
-$labels['testbody'] = 'This is a test notification.';
-$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
+$labels['body'] = 'Recibiu unha mensaxe nova';
+$labels['testbody'] = 'Esta ﾃｩ unha notificaciﾃｳn de proba';
+$labels['desktopdisabled'] = 'As notificaciﾃｳns de escritorio estﾃ｡n desactivadas no seu navegador';
 $labels['desktopunsupported'] = 'O teu navegador non soporta notificaciﾃｳns de escritorio.';
 
 ?>
diff --git a/plugins/newmail_notifier/localization/nl_NL.inc b/plugins/newmail_notifier/localization/nl_NL.inc
index e18a6ff2d..01f97e4ce 100644
--- a/plugins/newmail_notifier/localization/nl_NL.inc
+++ b/plugins/newmail_notifier/localization/nl_NL.inc
@@ -16,14 +16,14 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels['basic'] = 'Toon browsermelding bij nieuw bericht';
-$labels['desktop'] = 'Toon desktopmelding bij nieuw bericht';
-$labels['sound'] = 'Speel geluid bij nieuw bericht';
+$labels['basic'] = 'Toon melding in browser bij nieuw bericht';
+$labels['desktop'] = 'Toon melding op bureaublad bij nieuw bericht';
+$labels['sound'] = 'Geluid afspelen bij nieuw bericht';
 $labels['test'] = 'Test';
 $labels['title'] = 'Nieuwe e-mail!';
 $labels['body'] = 'U heeft een nieuw bericht ontvangen.';
 $labels['testbody'] = 'Dit is een testmelding.';
-$labels['desktopdisabled'] = 'Desktopmeldingen zijn uitgeschakeld in uw browser.';
-$labels['desktopunsupported'] = 'Uw browser ondersteunt geen desktopmeldingen.';
+$labels['desktopdisabled'] = 'Bureaubladmeldingen zijn uitgeschakeld in uw browser.';
+$labels['desktopunsupported'] = 'Uw browser ondersteunt geen bureaubladmeldingen.';
 
 ?>
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index c2c4599bc..e5b634602 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -17,21 +17,21 @@
 */
 
 $labels = array();
-$labels['changepasswd']  = 'Wijzig Wachtwoord';
-$labels['curpasswd']  = 'Huidig Wachtwoord:';
-$labels['newpasswd']  = 'Nieuw Wachtwoord:';
-$labels['confpasswd']  = 'Bevestig Nieuw Wachtwoord:';
+$labels['changepasswd']  = 'Wachtwoord wijzigen';
+$labels['curpasswd']  = 'Huidig wachtwoord:';
+$labels['newpasswd']  = 'Nieuw wachtwoord:';
+$labels['confpasswd']  = 'Bevestig nieuw wachtwoord:';
 
 $messages = array();
-$messages['nopassword'] = 'Vul een wachtwoord in.';
-$messages['nocurpassword'] = 'vul het huidige wachtwoord in.';
+$messages['nopassword'] = 'Vul uw nieuwe wachtwoord in.';
+$messages['nocurpassword'] = 'Vul uw huidige wachtwoord in.';
 $messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
 $messages['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
-$messages['crypterror'] = 'De server mist een functie om uw wachtwoord et beveiligen.';
-$messages['connecterror'] = 'Kan het nieuwe wachtwoord niet opslaan. Verbindingsfout.';
-$messages['internalerror'] = 'Uw wachtwoord kan niet worden opgeslagen.';
+$messages['crypterror'] = 'Nieuwe wachtwoord kan niet opgeslagen worden; de server mist een versleutelfunctie.';
+$messages['connecterror'] = 'Nieuwe wachtwoord kan niet opgeslagen worden; verbindingsfout.';
+$messages['internalerror'] = 'Uw nieuwe wachtwoord kan niet worden opgeslagen.';
 $messages['passwordshort'] = 'Het wachtwoord moet minimaal $length tekens lang zijn.';
-$messages['passwordweak'] = 'Het wachtwoord moet minimaal ﾃｩﾃｩn nummer en ﾃｩﾃｩn leesteken bevatten.';
+$messages['passwordweak'] = 'Het wachtwoord moet minimaal ﾃｩﾃｩn cijfer en ﾃｩﾃｩn leesteken bevatten.';
 $messages['passwordforbidden'] = 'Het wachtwoord bevat tekens die niet toegestaan zijn.';
 
 ?>
diff --git a/plugins/password/localization/zh_CN.inc b/plugins/password/localization/zh_CN.inc
index 5a15635e7..5d14926f2 100644
--- a/plugins/password/localization/zh_CN.inc
+++ b/plugins/password/localization/zh_CN.inc
@@ -24,13 +24,13 @@ $labels['confpasswd']  = '遑ｮ隶､譁ｰ蟇�遐��ｼ�';
 
 $messages = array();
 $messages['nopassword'] = '隸ｷ霎灘�･譁ｰ蟇�遐√��';
-$messages['nocurpassword'] = '隸ｷ霎灘�･豁｣遑ｮ逧�蟇�遐√��';
+$messages['nocurpassword'] = '隸ｷ霎灘�･蠖灘燕逧�蟇�遐√��';
 $messages['passwordincorrect'] = '蠖灘燕蟇�遐∽ｸ肴ｭ｣遑ｮ縲�';
 $messages['passwordinconsistency'] = '荳､谺｡霎灘�･逧�蟇�遐∽ｸ堺ｸ�閾ｴ�ｼ瑚ｯｷ驥崎ｯ輔��';
-$messages['crypterror'] = '譌�豕穂ｿ晏ｭ俶眠蟇�遐��ｼ悟屏荳ｺ蜉�蟇�蜉溯�ｽ荳榊庄逕ｨ縲�';
-$messages['connecterror'] = '譌�豕穂ｿ晏ｭ俶眠蟇�遐��ｼ悟屏荳ｺ霑樊磁蜃ｺ髞吶��';
+$messages['crypterror'] = '譌�豕穂ｿ晏ｭ俶眠蟇�遐��ｼ檎ｼｺ蟆大刈蟇�蜉溯�ｽ縲�';
+$messages['connecterror'] = '譌�豕穂ｿ晏ｭ俶眠蟇�遐��ｼ瑚ｿ樊磁蜃ｺ髞吶��';
 $messages['internalerror'] = '譌�豕穂ｿ晏ｭ俶眠蟇�遐√��';
-$messages['passwordshort'] = '蟇�遐∝ｿ�鬘ｻ閾ｳ蟆台ｸｺ $length 菴阪��';
+$messages['passwordshort'] = '蟇�遐∬�ｳ蟆台ｸｺ $length 菴阪��';
 $messages['passwordweak'] = '蟇�遐∝ｿ�鬘ｻ閾ｳ蟆大桁蜷ｫ荳�荳ｪ謨ｰ蟄怜柱荳�荳ｪ譬�轤ｹ隨ｦ蜿ｷ縲�';
 $messages['passwordforbidden'] = '蟇�遐∝桁蜷ｫ遖∵ｭ｢菴ｿ逕ｨ逧�蟄礼ｬｦ縲�';
 
diff --git a/plugins/userinfo/localization/nl_NL.inc b/plugins/userinfo/localization/nl_NL.inc
index 8c636e700..8c46ca6c4 100644
--- a/plugins/userinfo/localization/nl_NL.inc
+++ b/plugins/userinfo/localization/nl_NL.inc
@@ -19,7 +19,7 @@
 $labels = array();
 $labels['userinfo'] = 'Gebruikersinformatie';
 $labels['created'] = 'Aangemaakt';
-$labels['lastlogin'] = 'Laatste login';
+$labels['lastlogin'] = 'Laatste aanmelding';
 $labels['defaultidentity'] = 'Standaardidentiteit';
 
 ?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/zh_CN.inc b/plugins/userinfo/localization/zh_CN.inc
index 265c0704a..2b06ab218 100644
--- a/plugins/userinfo/localization/zh_CN.inc
+++ b/plugins/userinfo/localization/zh_CN.inc
@@ -18,8 +18,8 @@
 
 $labels = array();
 $labels['userinfo'] = '逕ｨ謌ｷ菫｡諱ｯ';
-$labels['created'] = '蛻帛ｻｺ';
-$labels['lastlogin'] = '譛�蜷守匳蠖�';
+$labels['created'] = '蛻帛ｻｺ莠�';
+$labels['lastlogin'] = '譛�霑醍匳蠖�';
 $labels['defaultidentity'] = '鮟倩ｮ､霄ｫ莉ｽ';
 
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/zh_CN.inc b/plugins/vcard_attachments/localization/zh_CN.inc
index 6deb21da4..5ff81a806 100644
--- a/plugins/vcard_attachments/localization/zh_CN.inc
+++ b/plugins/vcard_attachments/localization/zh_CN.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['addvcardmsg'] = '豺ｻ蜉� vCard 蛻ｰ蝨ｰ蝮�邁ｿ荳ｭ';
+$labels['addvcardmsg'] = '豺ｻ蜉� vCard 閾ｳ蝨ｰ蝮�邁ｿ荳ｭ';
 $labels['vcardsavefailed'] = '譌�豕穂ｿ晏ｭ� vCard';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index da2e80672..af08cc301 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾙ�ﾘｳﾘｮ';
 $labels['move']     = 'ﾙ�ﾙほ�';
 $labels['moveto']   = 'ﾙ�ﾙほ� ﾘ･ﾙ�ﾙ�...';
 $labels['download'] = 'ﾘｪﾙ�ﾘｲﾙ館�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾘｧﾙ�ﾘｵﾙ�ﾘｭﾘｩ ﾘｧﾙ�ﾘｭﾘｧﾙ�ﾙ韓ｩ';
 $labels['unread'] = 'ﾘｺﾙ韓ｱ ﾘｧﾙ�ﾙ�ﾙぺｱﾙ畏｡ﾘｩ';
 $labels['flagged'] = 'ﾙ�ﾙ畏ｳﾙ異�';
 $labels['unanswered'] = 'ﾘｨﾙ�ﾘｧ ﾘｱﾘｯ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾙ�ﾘｭﾘｰﾙ異�';
 $labels['undeleted'] = 'ﾘｺﾙ韓ｱ ﾙ�ﾘｭﾘｰﾙ異�ﾘｩ';
 $labels['invert'] = 'ﾘｹﾙ�ﾘｳ';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'ﾘｧﾙ�ﾘｪﾘｭ ﾙ�ﾙ� ﾙ�ﾘｧﾙ�ﾘｰﾘｩ ﾘｬﾘｯﾙ韓ｯﾘｩ';
 $labels['emlsave'] = 'ﾘｪﾙ�ﾘｲﾙ館� (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'ﾘｪﾘｹﾘｯﾙ館� ﾙ�ﾘｬﾘｯﾙ韓ｯ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾘ･ﾙ�ﾘｴﾘｧﾘ｡ ﾘｱﾘｳﾘｧﾘｦﾙ� ﾘｨﾙ�ﾘｳﾙ� HTML';
 $labels['htmlonreply'] = 'ﾘｭﾘｧﾙ� ﾘｧﾙ�ﾘｱﾘｯ ﾘｹﾙ�ﾙ� ﾘｧﾙ�ﾘｱﾘｳﾘｧﾘｦﾙ� ﾘｨﾘｵﾙ韓ｺﾘｩ HTML ﾙ�ﾙぺｷ';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ﾘｪﾙ異ほ韓ｹ HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾘ･ﾘｸﾙ�ﾘｧﾘｱ ﾙぺｳﾙ� ﾘｧﾙ�ﾙ�ﾘｹﾘｧﾙ館�ﾘｩ';
 $labels['skin'] = 'ﾘｴﾙ�ﾙ� ﾘｧﾙ�ﾙ畏ｧﾘｬﾙ�ﾘｩ';
 $labels['logoutclear'] = 'ﾘ･ﾙ�ﾘｱﾘｧﾘｺ ﾘｳﾙ�ﾘｩ ﾘｧﾙ�ﾙ�ﾘｭﾘｰﾙ異�ﾘｧﾘｪ ﾘｹﾙ�ﾘｯ ﾘｧﾙ�ﾘｮﾘｱﾙ畏ｬ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾘ･ﾘｲﾘｧﾙ�ﾘｩ ﾘｧﾙ�ﾘｪﾙ異ほ韓ｹ ﾙ�ﾙ� ﾘｧﾙ�ﾘｱﾘｳﾘｧﾙ�ﾘｩ
 $labels['autoaddsignature'] = 'ﾘ･ﾘｶﾘｧﾙ�ﾘｩ ﾘｧﾙ�ﾘｪﾙ異ほ韓ｹ ﾘ｢ﾙ�ﾙ韓ｧﾙ�';
 $labels['newmessageonly'] = 'ﾘｧﾙ�ﾘｱﾘｳﾘｧﾙ�ﾘｩ ﾘｧﾙ�ﾘｬﾘｯﾙ韓ｯﾘｩ ﾙ�ﾙぺｷ';
 $labels['replyandforwardonly'] = 'ﾘｧﾙ�ﾘｱﾘｯﾙ畏ｯ ﾙ畏ｧﾙ�ﾘｪﾙ�ﾘｱﾙ韓ｱﾘｧﾘｪ ﾙ�ﾙぺｷ';
-$labels['replysignaturepos'] = 'ﾘ･ﾘｶﾘｧﾙ�ﾘｩ ﾘｧﾙ�ﾘｪﾙ異ほ韓ｹ ﾘｹﾙ�ﾘｯ ﾘｧﾙ�ﾘｱﾘｯ ﾘ｣ﾙ� ﾘｧﾙ�ﾘｪﾙ�ﾘｱﾙ韓ｱ';
-$labels['belowquote'] = 'ﾘｨﾘｹﾘｯ ﾘｧﾙ�ﾘｧﾙぺｪﾘｨﾘｧﾘｳ';
-$labels['abovequote'] = 'ﾙぺｨﾙ� ﾘｧﾙ�ﾘｧﾙぺｪﾘｨﾘｧﾘｳ';
 $labels['insertsignature'] = 'ﾘ･ﾘｶﾘｧﾙ�ﾘｩ ﾘｧﾙ�ﾘｪﾙ異ほ韓ｹ';
 $labels['previewpanemarkread']  = 'ﾘｪﾘｭﾘｯﾙ韓ｯ ﾘｧﾙ�ﾘｱﾘｳﾘｧﾘｦﾙ� ﾘｧﾙ�ﾙ�ﾙ証ｹﾘｧﾙ館�ﾘｩ ﾙ�ﾙ�ﾙぺｱﾙ畏｡ﾘｩ';
 $labels['afternseconds']  = 'ﾘｨﾘｹﾘｯ $n ﾘｫﾙ畏ｧﾙ�ﾙ�';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index e10c83228..9429a3910 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾘｮﾘｷﾘ｣ ﾙ�ﾙ� ﾙぺｧﾘｹﾘｯﾘｩ ﾘｧﾙ�ﾘｨﾙ韓ｧﾙ�ﾘｧﾘｪ!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'ﾘｪﾘｹﾘｰﾘｱ ﾘｪﾙ�ﾙ�ﾙ韓ｰ ﾘｧﾙ�ﾘｹﾙ�ﾙ�ﾙ韓ｩ. ﾘｧﾙ�ﾙ�ﾘｬﾙ�ﾘｯ ﾙ�ﾙ�ﾙぺｱﾘｧﾘ｡ﾘｩ ﾙ�ﾙぺｷ.';
 $messages['errornoperm'] = 'ﾘｪﾘｹﾘｰﾘｱ ﾘｪﾙ�ﾙ�ﾙ韓ｰ ﾘｧﾙ�ﾘｹﾙ�ﾙ�ﾙ韓ｩ. ﾙ�ﾙ韓ｳﾘｪ ﾙ�ﾘｯﾙ館� ﾘｧﾙ�ﾘｵﾙ�ﾘｧﾘｭﾙ韓ｩ.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'ﾘｷﾙ�ﾘｨ ﾘｺﾙ韓ｱ ﾘｵﾘｧﾙ�ﾘｭ! ﾙ�ﾙ� ﾘｪﾘｭﾙ�ﾘｸ ﾘ｣ﾙ韓ｩ ﾘｨﾙ韓ｧﾙ�ﾘｧﾘｪ.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ﾙ�ﾙ� ﾙ韓ｹﾘｫﾘｱ ﾘｹﾙ�ﾙ� ﾘ｣ﾙ韓ｩ ﾘｱﾘｳﾘｧﾘｦﾙ� ﾙ�ﾙ� ﾘｵﾙ�ﾘｯﾙ異� ﾘｧﾙ�ﾘｨﾘｱﾙ韓ｯ ﾙ�ﾘｰﾘｧ';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 075097e42..49f85689b 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'mover pa...';
 $labels['download'] = 'baxar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Ensin lleer';
 $labels['flagged'] = 'Marcﾃ｡u';
 $labels['unanswered'] = 'Ensin contestar';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Desaniciﾃ｡u';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invertir';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Abrir en una ventana nueva';
 $labels['emlsave'] = 'Baxar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Facer el mensaxe n\'HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Firma HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Entever';
 $labels['skin'] = 'Estilu';
 $labels['logoutclear'] = 'Vaciar la papelera al zarrar la sesiﾃｳn';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 135f70b73..9e415b8ec 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Fallu de la solicitﾃｺ. Nun se guardaron datos.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nun doi con mensaxes';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 1b7994f8d..0cb4b3e82 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopyala';
 $labels['move']     = 'Kﾃｶﾃｧﾃｼr';
 $labels['moveto']   = 'Burada kﾃｶﾃｧﾃｼr...';
 $labels['download'] = 'Endir';
+$labels['open']     = 'Aﾃｧ';
 $labels['showattachment'] = 'Gﾃｶstﾉ决';
 $labels['showanyway'] = 'ﾄｰstﾉ冢ilﾉ冢 halda gﾃｶstﾉ决';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Hazﾄｱrki sﾉ冑ifﾉ冢i';
 $labels['unread'] = 'Oxunmamﾄｱﾅ殕arﾄｱ';
 $labels['flagged'] = 'ﾄｰﾅ歛rﾉ冤ilﾉ决i';
 $labels['unanswered'] = 'Cavabsﾄｱzlarﾄｱ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Silinmiﾅ殕ﾉ决i';
 $labels['undeleted'] = 'Silinmﾉ凉ib';
 $labels['invert'] = 'ﾄｰnvertlilﾉ决i';
@@ -204,6 +206,8 @@ $labels['body']  = 'Mﾉ冲n';
 
 $labels['openinextwin'] = 'Yeni pﾉ冢cﾉ决ﾉ囘ﾉ� aﾃｧ';
 $labels['emlsave'] = 'Saxla (.eml)';
+$labels['changeformattext'] = 'Sadﾉ� mﾉ冲n formatﾄｱnda gﾃｶstﾉ决';
+$labels['changeformathtml'] = 'HTML formatﾄｱnda gﾃｶstﾉ决';
 
 // message compose
 $labels['editasnew']      = 'Yeni kimi redaktﾉ� et';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Seﾃｧilmiﾅ� ﾃｼnvanlara mﾉ冖tub yaz';
 $labels['contactsfromto'] = '$count ﾃｼnvanﾄｱnﾄｱn $from - $to arasﾄｱ';
 $labels['print']          = 'ﾃ�ap et';
 $labels['export']         = 'ﾄｰxrac et';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Hamﾄｱsﾄｱnﾄｱ ﾄｰxrac et';
+$labels['exportsel']      = 'Seﾃｧilmiﾅ殕ﾉ决i ﾄｰxrac et';
 $labels['exportvcards']   = 'ﾃ從vanlarﾄｱ vCards formatﾄｱnda ixrac et';
 $labels['newcontactgroup'] = 'ﾃ從vanlar qrupunu yarat';
 $labels['grouprename']    = 'Qruﾄ殷n adﾄｱnﾄｱ dﾉ凉iﾅ歸ir';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML-dﾉ� mesaj yaz';
 $labels['htmlonreply'] = 'yalnﾄｱz HTML mesajlar ilﾉ� cavab';
 $labels['htmlonreplyandforward'] = 'HTML mﾉ冖tuba cavab vﾉ� yﾃｶnﾉ冤tmﾉ� zamanﾄｱ';
 $labels['htmlsignature'] = 'HTML imza';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prevyu paneli gﾃｶstﾉ决';
 $labels['skin'] = 'ﾄｰnterfeys stili';
 $labels['logoutclear'] = 'Poﾃｧtdan ﾃｧﾄｱxan zaman sﾉ冀ﾉ冲i tﾉ冦izlﾉ�';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Cavab zamanﾄｱ imzanﾄｱ sil';
 $labels['autoaddsignature'] = 'ﾄｰmzanﾄｱ avtomatik ﾉ冤avﾉ� et';
 $labels['newmessageonly'] = 'yalnﾄｱz yeni mﾉ冖tublarda';
 $labels['replyandforwardonly'] = 'Yalnﾄｱz cavab vﾉ� yﾃｶnﾉ冤dilﾉ冢lﾉ决dﾉ�';
-$labels['replysignaturepos'] = 'Cavab vﾉ� yﾃｶnﾉ冤tmﾉ� zamanﾄｱ imzanﾄｱ bﾉ决kid';
-$labels['belowquote'] = 'sitatdan sonra';
-$labels['abovequote'] = 'sitatdan ﾉ况vﾉ冤';
 $labels['insertsignature'] = 'ﾄｰmza ﾉ冤avﾉ� et';
 $labels['previewpanemarkread']  = 'Baxﾄｱlmﾄｱﾅ� ﾅ淤冖illﾉ决i oxunmuﾅ� kimi qeyd et';
 $labels['afternseconds']  = '$n saniyﾉ囘ﾉ冢 sonra';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index 939827247..418f270be 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -17,20 +17,22 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'Xﾉ冲a baﾅ� verib!';
-$messages['loginfailed']  = 'Giriﾅ� uﾄ殷rsuz oldu';
-$messages['cookiesdisabled'] = 'Sizin brauzer kukilﾉ决i qﾉ冀ul etmir';
-$messages['sessionerror'] = 'Sizin sessiya kﾃｶhnﾉ冤ib';
-$messages['storageerror'] = 'IMAP serverlﾉ� baﾄ殕antﾄｱ alﾄｱnmadﾄｱ';
-$messages['servererror'] = 'Server xﾉ冲asﾄｱ!';
-$messages['servererrormsg'] = 'Server xﾉ冲asﾄｱ: $msg';
-$messages['dberror'] = 'Mﾉ冤umatlar bazasﾄｱnda xﾉ冲a!';
+$messages['errortitle']  = 'Xﾉ冲a baﾅ� verdi!';
+$messages['loginfailed']  = 'Giriﾅ� uﾄ殷rsuz oldu.';
+$messages['cookiesdisabled'] = 'Sizin brauzer kukilﾉ决i qﾉ冀ul etmir.';
+$messages['sessionerror'] = 'Sizin sessiya kﾃｶhnﾉ冤ib.';
+$messages['storageerror'] = 'IMAP serverlﾉ� baﾄ殕antﾄｱ alﾄｱnmadﾄｱ.';
+$messages['servererror'] = 'Server Xﾉ冲asﾄｱ!';
+$messages['servererrormsg'] = 'Server Xﾉ冲asﾄｱ: $msg';
+$messages['dberror'] = 'Mﾉ冤umatlar Bazasﾄｱnda Xﾉ冲a!';
 $messages['requesttimedout'] = 'Sorﾄ殷nun gﾃｶzlﾉ冦ﾉ� mﾃｼddﾉ冲i bitdi';
-$messages['errorreadonly'] = 'ﾆ塾ﾉ冤iyyatﾄｱ etmﾉ冖 mﾃｼmkﾃｼn deyil. Qovluq yalnﾄｱz oxunuﾅ� ﾃｼﾃｧﾃｼndﾃｼr.';
+$messages['errorreadonly'] = 'ﾆ塾ﾉ冤iyyatﾄｱ icra etmﾉ冖 mﾃｼmkﾃｼn deyil. Qovluq yalnﾄｱz oxunuﾅ� ﾃｼﾃｧﾃｼndﾃｼr.';
 $messages['errornoperm'] = 'ﾆ塾ﾉ冤iyyatﾄｱ etmﾉ冖 mﾃｼmkﾃｼn deyil. Giriﾅ� qadaﾄ歛ndﾄｱr.';
+$messages['erroroverquota'] = 'ﾆ塾ﾉ冤iyyat icra edilﾉ� bilinmir. Boﾅ� disk hﾉ冂mi yoxdur.';
+$messages['erroroverquotadelete'] = 'Boﾅ� disk hﾉ冂mi yoxdur. Mﾉ冖tubu silmﾉ冖 ﾃｼﾃｧﾃｼn SHIFT+DEL dﾃｼymﾉ冱ini istifadﾉ� edin.';
 $messages['invalidrequest'] = 'Sﾉ冑v sorﾄ殷! Mﾉ冤umat yaddaﾅ歸a qalmadﾄｱ.';
-$messages['invalidhost'] = 'Sﾉ冑v server adﾄｱ';
-$messages['nomessagesfound'] = 'Poﾃｧt qutusunda mﾉ冖tub tapﾄｱlmadﾄｱ';
+$messages['invalidhost'] = 'Sﾉ冑v server adﾄｱ.';
+$messages['nomessagesfound'] = 'Poﾃｧt qutusunda mﾉ冖tub tapﾄｱlmadﾄｱ.';
 $messages['loggedout'] = 'ﾃ�ﾄｱxﾄｱﾅ� uﾄ殷rlu oldu. Saﾄ� olun!';
 $messages['mailboxempty'] = 'Poﾃｧt qutusu boﾅ歸ur';
 $messages['refreshing'] = 'Yenilﾉ冢mﾉ�...';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index 5bafc78f1..a5489a454 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copy';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index 0aaa4d4d7..73cdb3ed8 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾐ渙ｰﾐｼﾑ巾ｻﾐｺﾐｰ ﾐｱﾐｰﾐｷﾑ� ﾐｴﾐｰﾐｽﾑ錦�!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'ﾐ斷ｵﾐｼﾐｰﾐｳﾑ�ﾑ巾ｼﾐｰ ﾐｲﾑ巾ｺﾐｰﾐｽﾐｰﾑ�ﾑ� ﾐｰﾐｿﾐｵﾑ�ﾐｰﾑ�ﾑ錦�. ﾐ｢ﾑ采�ﾐｺﾐｰ ﾐｴﾐｰﾑ�ﾑびσｿﾐｽﾐｰ ﾑひｾﾐｻﾑ糊ｺﾑ� ﾐｴﾐｻﾑ� ﾑ�ﾑ錦ひｰﾐｽﾐｽﾑ�.';
 $messages['errornoperm'] = 'ﾐ斷ｵﾐｼﾐｰﾐｳﾑ�ﾑ巾ｼﾐｰ ﾐｲﾑ巾ｺﾐｰﾐｽﾐｰﾑ�ﾑ� ﾐｰﾐｿﾐｵﾑ�ﾐｰﾑ�ﾑ錦�. ﾐ籍ｴﾐｼﾐｾﾑ榧ｻﾐｵﾐｽﾐｰ ﾑ� ﾐｴﾐｾﾑ�ﾑびσｿﾐｵ.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'ﾐ斷ｵ ﾐｴﾐｷﾐｵﾐｹﾑ�ﾐｽﾑ� ﾐｷﾐｰﾐｿﾑ錦�! ﾐ頒ｰﾐｽﾑ錦� ﾐｽﾐｵ ﾐｷﾐｰﾑ�ﾐｰﾐｲﾐｰﾐｽﾑ錦�.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 0a5334263..6542cfc53 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾐ墟ｾﾐｿﾐｸﾑ�ﾐｰﾐｽﾐｵ';
 $labels['move']     = 'ﾐ湲�ﾐｵﾐｼﾐｵﾑ�ﾑひｲﾐｰﾐｽﾐｵ';
 $labels['moveto']   = 'ﾐ湲�ﾐｵﾐｼﾐｵﾑ�ﾑひｸ ﾐｲ...';
 $labels['download'] = 'ﾐ侑ｷﾑひｵﾐｳﾐｻﾐｸ';
+$labels['open']     = 'ﾐ樮ひｲﾐｾﾑ�ﾐｸ';
 $labels['showattachment'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｲﾐｰﾐｽﾐｵ';
 $labels['showanyway'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｲﾐｰﾐｽﾐｵ ﾐｲﾑ諌ｿﾑ�ﾐｵﾐｺﾐｸ ﾑひｾﾐｲﾐｰ';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾐ｡ﾑび�ﾐｰﾐｽﾐｸﾑ�ﾐｰ';
 $labels['unread'] = 'ﾐ斷ｾﾐｲﾐｸ';
 $labels['flagged'] = 'ﾐ樮ひｱﾐｵﾐｻﾑ紹ｷﾐｰﾐｽﾐｾ';
 $labels['unanswered'] = 'ﾐ岱ｵﾐｷ ﾐｾﾑひｳﾐｾﾐｲﾐｾﾑ�';
+$labels['withattachment'] = 'ﾐ｡ ﾐｿﾑ�ﾐｸﾐｺﾐｰﾑ�ﾐｵﾐｽ ﾑ�ﾐｰﾐｹﾐｻ';
 $labels['deleted'] = 'ﾐ侑ｷﾑび�ﾐｸﾑひｾ';
 $labels['undeleted'] = 'ﾐ斷ｵ ﾐｵ ﾐｸﾐｷﾑび�ﾐｸﾑ�';
 $labels['invert'] = 'ﾐ侑ｽﾐｲﾐｵﾑ�ﾑひｸﾑ�ﾐｰﾐｹ';
@@ -204,6 +206,8 @@ $labels['body']  = 'ﾐ樮�ﾐｽﾐｾﾐｲﾐｵﾐｽ ﾑひｵﾐｺﾑ�ﾑ�';
 
 $labels['openinextwin'] = 'ﾐ樮ひｲﾐｾﾑ�ﾐｸ ﾐｲ ﾐｽﾐｾﾐｲ ﾐｿﾑ�ﾐｾﾐｷﾐｾﾑ�ﾐｵﾑ�';
 $labels['emlsave'] = 'ﾐ侑ｷﾑひｵﾐｳﾐｻﾐｸ ﾐｺﾐｰﾑひｾ .eml';
+$labels['changeformattext'] = 'ﾐ渙ｾﾐｺﾐｰﾐｶﾐｸ ﾐｲ ﾐｾﾐｿﾑ�ﾐｾﾑ�ﾑひｵﾐｽ ﾑひｵﾐｺﾑ�ﾑひｾﾐｲ ﾑ�ﾐｾﾑ�ﾐｼﾐｰﾑ�';
+$labels['changeformathtml'] = 'ﾐ渙ｾﾐｺﾐｰﾐｶﾐｸ ﾐｲ HTML ﾑ�ﾐｾﾑ�ﾐｼﾐｰﾑ�';
 
 // message compose
 $labels['editasnew']      = 'ﾐ湲�ﾐｾﾐｼﾐｵﾐｽﾐｸ ﾐｺﾐｰﾑひｾ ﾐｽﾐｾﾐｲﾐｾ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾐ渙ｸﾑ�ﾐｰﾐｽﾐｵ ﾐｽﾐｰ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸe ﾐｺﾐｰﾑひｾ HTML';
 $labels['htmlonreply'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｿﾑ�ﾐｸ ﾐｾﾑひｳﾐｾﾐｲﾐｾﾑ� ﾐｽﾐｰ HTML ﾑ�ﾑ諌ｱﾐｾﾑ禍ｵﾐｽﾐｸﾑ�';
 $labels['htmlonreplyandforward'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｿﾑ�ﾐｸ ﾐｿﾑ�ﾐｵﾐｿﾑ�ﾐｰﾑ禍ｰﾐｽﾐｵ ﾐｸﾐｻﾐｸ ﾐｾﾑひｳﾐｾﾐｲﾐｾﾑ� ﾐｽﾐｰ HTML ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｵ';
 $labels['htmlsignature'] = 'HTML ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ�';
+$labels['showemail'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｲﾐｰ email ﾐｰﾐｴﾑ�ﾐｵﾑ� ﾑ� ﾐｵﾐｺﾑ�ﾐｰﾐｽﾐｽﾐｾﾑひｾ ﾐｸﾐｼﾐｵ';
 $labels['previewpane'] = 'ﾐ渙ｰﾐｽﾐｵﾐｻ ﾐｷﾐｰ ﾐｿﾑ�ﾐｵﾐｳﾐｻﾐｵﾐｴ';
 $labels['skin'] = 'ﾐ｡ﾐｼﾑ紹ｽﾐｰ ﾐｸﾐｷﾐｳﾐｻﾐｵﾐｴﾐｰ ﾐｽﾐｰ ﾐｸﾐｽﾑひｵﾑ�ﾑ�ﾐｵﾐｹﾑ�ﾐｰ';
 $labels['logoutclear'] = 'ﾐ侑ｷﾑ�ﾐｸﾑ�ﾑひｸ ﾐｺﾐｾﾑ尉�ﾐｵﾑひｾ ﾐｿﾑ�ﾐｸ ﾐｸﾐｷﾑ�ﾐｾﾐｴ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾐ湲�ﾐｵﾐｼﾐｰﾑ�ﾐｲﾐｰﾐｽﾐｵ ﾐｽﾐｰ ﾐｿﾑ�ﾐｵﾐｴﾐｸﾑ威ｽﾐｸﾑ�
 $labels['autoaddsignature'] = 'ﾐ籍ｲﾑひｾﾐｼﾐｰﾑひｸﾑ�ﾐｽﾐｾ ﾐｴﾐｾﾐｱﾐｰﾐｲﾑ紹ｽﾐｵ ﾐｽﾐｰ ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ�';
 $labels['newmessageonly'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｽﾐｰ ﾐｽﾐｾﾐｲﾐｸ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ�';
 $labels['replyandforwardonly'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｽﾐｰ ﾐｾﾑひｳﾐｾﾐｲﾐｾﾑ�ﾐｸ ﾐｸ ﾐｿﾑ�ﾐｵﾐｿﾑ�ﾐｰﾑひｵﾐｽﾐｸ';
-$labels['replysignaturepos'] = 'ﾐ渙ｾﾑ�ﾑひｰﾐｲﾑ紹ｽﾐｵ ﾐｽﾐｰ ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ� ﾐｿﾑ�ﾐｸ ﾐｾﾑひｳﾐｾﾐｲﾐｾﾑ� ﾐｸﾐｻﾐｸ ﾐｿﾑ�ﾐｵﾐｿﾑ�ﾐｰﾑ禍ｰﾐｽﾐｵ';
-$labels['belowquote'] = 'ﾐｽﾐｰﾐｴ ﾑ�ﾐｸﾑひｰﾑび貫�';
-$labels['abovequote'] = 'ﾐｿﾐｾﾐｴ ﾑ�ﾐｸﾑひｰﾑび貫�';
 $labels['insertsignature'] = 'ﾐ漬ｼﾑ諌ｺﾐｲﾐｰﾐｽﾐｵ ﾐｽﾐｰ ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ�';
 $labels['previewpanemarkread']  = 'ﾐ慴ｰﾑ�ﾐｺﾐｸﾑ�ﾐｰﾐｽﾐｵ ﾐｽﾐｰ ﾐｿﾑ�ﾐｵﾐｳﾐｻﾐｵﾐｴﾐｰﾐｽﾐｸﾑひｵ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ� ﾐｺﾐｰﾑひｾ ﾐｿﾑ�ﾐｾﾑ�ﾐｵﾑひｵﾐｽﾐｸ';
 $labels['afternseconds']  = 'ﾑ�ﾐｻﾐｵﾐｴ $n ﾑ�ﾐｵﾐｺﾑσｽﾐｴﾐｸ';
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index ead68921c..219772e74 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾐ酉�ﾐｵﾑ威ｺﾐｰ ﾑ� ﾐｱﾐｰﾐｷﾐｰﾑひｰ ﾐｴﾐｰﾐｽﾐｽﾐｸ!';
 $messages['requesttimedout'] = 'ﾐ厘ｰﾑ紹ｲﾐｺﾐｰﾑひｰ ﾐｵ ﾑ� ﾐｸﾐｷﾑひｵﾐｺﾐｻﾐｾ ﾐｲﾑ�ﾐｵﾐｼﾐｵ';
 $messages['errorreadonly'] = 'ﾐ榧ｿﾐｵﾑ�ﾐｰﾑ�ﾐｸﾑ肖ひｰ ﾐｽﾐｵ ﾐｼﾐｾﾐｶﾐｵ ﾐｴﾐｰ ﾐｱﾑ諌ｴﾐｵ ﾐｸﾐｷﾐｿﾑ諌ｻﾐｽﾐｵﾐｽﾐｰ. ﾐ渙ｰﾐｿﾐｺﾐｰﾑひｰ ﾐｵ ﾑ� ﾐｿﾑ�ﾐｰﾐｲﾐｰ ﾑ�ﾐｰﾐｼﾐｾ ﾐｷﾐｰ ﾑ�ﾐｵﾑひｵﾐｽﾐｵ';
 $messages['errornoperm'] = 'ﾐ榧ｿﾐｵﾑ�ﾐｰﾑ�ﾐｸﾑ肖ひｰ ﾐｽﾐｵ ﾐｼﾐｾﾐｶﾐｵ ﾐｴﾐｰ ﾐｱﾑ諌ｴﾐｵ ﾐｸﾐｷﾐｿﾑ諌ｻﾐｽﾐｵﾐｽﾐｰ. ﾐ樮ひｺﾐｰﾐｷﾐｰﾐｽﾐｸ ﾐｿﾑ�ﾐｰﾐｲﾐｰ ﾐｷﾐｰ ﾐｴﾐｾﾑ�ﾑび諌ｿ';
+$messages['erroroverquota'] = 'ﾐ斷ｵﾐｲﾑ諌ｷﾐｼﾐｾﾐｶﾐｽﾐｾ ﾐｸﾐｷﾐｲﾑ貫�ﾑ威ｲﾐｰﾐｽﾐｵ ﾐｽﾐｰ ﾐｴﾐｵﾐｹﾑ�ﾑひｲﾐｸﾐｵﾑひｾ, ﾐｽﾑ紹ｼﾐｰ ﾐｴﾐｾﾑ�ﾑひｰﾑび貫�ﾐｽﾐｾ ﾑ�ﾐｲﾐｾﾐｱﾐｾﾐｴﾐｽﾐｾ ﾐｴﾐｸﾑ�ﾐｺﾐｾﾐｲﾐｾ ﾐｿﾑ�ﾐｾﾑ�ﾑび�ﾐｰﾐｽﾑ�ﾑひｲﾐｾ.';
+$messages['erroroverquotadelete'] = 'ﾐ旃紹ｼﾐｰ ﾐｴﾐｾﾑ�ﾑひｰﾑび貫�ﾐｽﾐｾ ﾑ�ﾐｲﾐｾﾐｱﾐｾﾐｴﾐｽﾐｾ ﾐｴﾐｸﾑ�ﾐｺﾐｾﾐｲﾐｾ ﾐｿﾑ�ﾐｾﾑ�ﾑび�ﾐｰﾐｽﾑ�ﾑひｲﾐｾ. ﾐ渙ｾﾐｻﾐｷﾐｲﾐｰﾐｹﾑひｵ SHIFT+DEL ﾐｷﾐｰ ﾐｴﾐｰ ﾐｸﾐｷﾑび�ﾐｸﾐｵﾑひｵ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｵ.';
 $messages['invalidrequest'] = 'ﾐ斷ｵﾐｲﾐｰﾐｻﾐｸﾐｴﾐｽﾐｰ ﾐｷﾐｰﾑ紹ｲﾐｺﾐｰ! ﾐ頒ｰﾐｽﾐｽﾐｸﾑひｵ ﾐｽﾐｵ ﾑ�ﾐｰ ﾑ�ﾑ貫�ﾑ�ﾐｰﾐｽﾐｵﾐｽﾐｸ.';
 $messages['invalidhost'] = 'ﾐ斷ｵﾐｲﾐｰﾐｻﾐｸﾐｴﾐｽﾐｾ ﾐｸﾐｼﾐｵ ﾐｽﾐｰ ﾑ�ﾑ貫�ﾐｲﾑ貫�';
 $messages['nomessagesfound'] = 'ﾐ旃紹ｼﾐｰ ﾑ�ﾑ諌ｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ�';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index f1ad34bc0..a0866a3a7 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '爬�爬ｨ爰≒ｦｲ爬ｿ爬ｪ爬ｿ爬ｰ 爬�爬ｿ爬歩ｦｾ爬ｨ爬ｾ';
 $labels['move']     = 'Move';
 $labels['moveto']   = '爬ｸ爬ｰ爬ｿ爰游ｧ� 爬ｫ爰�爬ｲ爰≒ｦｨ..';
 $labels['download'] = '爬｡爬ｾ爬霞ｦｨ爬ｲ爰金ｦ｡';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = '爬ｨ爬ｾ爬ｦ爰�爬籾ｦｾ (unread)';
 $labels['flagged'] = '爬ｦ爬ｾ爬伶ｦｾ爬ｨ爰� (flagged)';
 $labels['unanswered'] = '爬霞ｦ､爰財ｦ､爬ｰ 爬ｨ爬ｾ 爬ｦ爰�爬内ｧ游ｦｾ 爬伶ｧ≒ｦｲ爰�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = '爬ｨ爬､爰≒ｦｨ 爬霞ｦ�爬ｨ爰財ｦ｡爰� 爬､爰� 爬ｦ爰�爬籾ｧ≒ｦｨ';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML 爬� 爬ｮ爰�爬�爬ｲ/爬壟ｦｿ爬�爬ｿ 爬ｲ爬ｿ爬籾ｧ≒ｦｨ';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML 爬� 爬ｸ爰財ｦｬ爬ｾ爬歩ｧ財ｦｷ爬ｰ';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '爬巵ｧ金ｦ游ｧ金ｦ歩ｦｰ爰� 爬ｦ爰�爬籾ｦｾ爬ｰ 爬憫ｦｾ爰游ｦ伶ｦｾ';
 $labels['skin'] = '爬ｮ爰�爬�爬ｲ爬ｬ爬歩ｧ財ｦｸ 爬鐘ｦｰ 爬ｪ爰≒ｦｰ爰金ｦ游ｦｾ爬ｰ 爬壟ｧ�爬ｹ爬ｾ爬ｰ爬ｾ';
 $labels['logoutclear'] = '爬ｬ爰�爬ｰ爬ｹ爬ｬ爬ｾ爬ｰ 爬ｸ爬ｮ爰� 爬｡爬ｾ爬ｸ爰財ｦ游ｦｬ爬ｿ爬ｨ 爬�爬游ｧ金ｦｮ爰�爬游ｦｿ爬� 爬籾ｦｾ爬ｲ爬ｿ 爬ｹ爬ｬ爰�';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index eaa4024b1..44d5fcc60 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '爬鐘ｦ� 爬ｮ爰�爬�爬ｲ爬ｬ爬歩ｧ財ｦｸ爰� 爬歩ｧ金ｦｨ爰� 爬壟ｦｿ爬�爬ｿ 爬ｨ爬ｾ爬�';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 4cc9e6f89..537a887df 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Eilaﾃｱ';
 $labels['move']     = 'Dilec\'hiaﾃｱ';
 $labels['moveto']   = 'Dilec\'hiaﾃｱ da...';
 $labels['download'] = 'Pellgargaﾃｱ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Diskouez';
 $labels['showanyway'] = 'Diskouez anezhaﾃｱ memestra';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na lennet';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Sevel ur c\'hemennad er furmad HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Sinadur HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Diskouez panel alberz';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 425dad996..c1988577d 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Fazi stlennvon !';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Kemennadoﾃｹ ebet er voest lizhiri';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 37b1abebb..5afdcad1f 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premjesti';
 $labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi';
+$labels['open']     = 'Otvori';
 $labels['showattachment'] = 'Prikaﾅｾi';
 $labels['showanyway'] = 'Ipak prikaﾅｾi';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Neproﾄ絞tano';
 $labels['flagged'] = 'Vaﾅｾno';
 $labels['unanswered'] = 'Neodgovoreno';
+$labels['withattachment'] = 'Sa prilogom';
 $labels['deleted'] = 'Obrisano';
 $labels['undeleted'] = 'Nije obrisano';
 $labels['invert'] = 'Izokreni';
@@ -204,6 +206,8 @@ $labels['body']  = 'Tijelo';
 
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
+$labels['changeformattext'] = 'Prikaﾅｾi kao obiﾄ肱i tekst';
+$labels['changeformathtml'] = 'Prikaﾅｾi kao HTML';
 
 // message compose
 $labels['editasnew']      = 'Uredi kao novo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Piﾅ｡i HTML poruke';
 $labels['htmlonreply'] = 'samo kao odgovor na HTML poruke';
 $labels['htmlonreplyandforward'] = 'prilikom prosljeﾄ訴vanja ili odgovaranja na HTML poruku';
 $labels['htmlsignature'] = 'HTML potpis';
+$labels['showemail'] = 'Prikaﾅｾi email adresu sa imenom';
 $labels['previewpane'] = 'Prikaﾅｾi pregled poruke';
 $labels['skin'] = 'Skin interfejsa';
 $labels['logoutclear'] = 'Oﾄ絞sti smeﾄ�e prilikom odjavljivanja';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Prilikom odgovaranja na poruku, ukloni origin
 $labels['autoaddsignature'] = 'Automatski dodaj potpis';
 $labels['newmessageonly'] = 'samo za nove poruke';
 $labels['replyandforwardonly'] = 'samo za odgovore i prosljeﾄ訴vanja';
-$labels['replysignaturepos'] = 'Prilikom odgovaranja ili prosljeﾄ訴vanja potpis ubaci';
-$labels['belowquote'] = 'ispod citata';
-$labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
 $labels['previewpanemarkread']  = 'Obiljeﾅｾi prikazane poruke kao proﾄ絞tane';
 $labels['afternseconds']  = 'nakon $n sekundi';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 3949a42a6..7a1b26168 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Greﾅ｡ka u bazi podataka!';
 $messages['requesttimedout'] = 'Zahtjev je istekao';
 $messages['errorreadonly'] = 'Nije moguﾄ�e izvrﾅ｡iti operaciju. Folder je samo za ﾄ絞tanje.';
 $messages['errornoperm'] = 'Nije moguﾄ�e izvrﾅ｡iti operaciju. Pristup je odbijen.';
+$messages['erroroverquota'] = 'Nije moguﾄ�e izvrﾅ｡iti operaciju. Nema slobodnog prostora.';
+$messages['erroroverquotadelete'] = 'Nema slobodnog prostora. Pritisnite SHIFT+DEL da obriﾅ｡ete poruku.';
 $messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu saﾄ講vani.';
 $messages['invalidhost'] = 'Neispravno ime servera.';
 $messages['nomessagesfound'] = 'Nema poruka u ovom sanduﾄ稿tu.';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 3d5df27b4..3be753b68 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Correu brossa';
 // message listing
 $labels['subject'] = 'Assumpte';
 $labels['from']    = 'Remitent';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitent';
 $labels['to']      = 'Destinatari';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -64,7 +64,8 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Mou';
 $labels['moveto']   = 'Mou a...';
 $labels['download'] = 'Descarrega';
-$labels['showattachment'] = 'Mostrar';
+$labels['open']     = 'Obre';
+$labels['showattachment'] = 'Mostra';
 $labels['showanyway'] = 'Mostra-ho de totes maneres';
 
 $labels['filename'] = 'Nom del fitxer';
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pﾃ�gina actual';
 $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'No respost';
+$labels['withattachment'] = 'Amb fitxer adjunt';
 $labels['deleted'] = 'Suprimit';
 $labels['undeleted'] = 'No s\'ha suprimit';
 $labels['invert'] = 'Inverteix';
@@ -200,10 +202,12 @@ $labels['quicksearch']  = 'Cerca rﾃ�pida';
 $labels['resetsearch']  = 'Neteja cerca';
 $labels['searchmod']  = 'Cerca modificadors';
 $labels['msgtext']  = 'Missatge sencer';
-$labels['body']  = 'Body';
+$labels['body']  = 'Cos';
 
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
+$labels['changeformattext'] = 'Mostra en format de text net';
+$labels['changeformathtml'] = 'Mostra en format HTML';
 
 // message compose
 $labels['editasnew']      = 'Edita com a nou';
@@ -243,7 +247,7 @@ $labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
 $labels['isdraft']    = 'Aquest ﾃｩs un missatge esborrany.';
 $labels['andnmore']   = '$nr mﾃｩs...';
 $labels['togglemoreheaders'] = 'Mostra mﾃｩs capﾃｧaleres del missatge';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = 'Conmuta les capﾃｧaleres de text cru';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text net';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Redacta correu per a';
 $labels['contactsfromto'] = 'Contactes $from a $to de $count';
 $labels['print']          = 'Imprimeix';
 $labels['export']         = 'Exporta';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Exporta\'ls tots';
+$labels['exportsel']      = 'Exporta els seleccionats';
 $labels['exportvcards']   = 'Exporta contactes en format vCard';
 $labels['newcontactgroup'] = 'Crea un nou grup de contactes';
 $labels['grouprename']    = 'Reanomena el grup';
@@ -360,7 +364,7 @@ $labels['importcontacts'] = 'Importa contactes';
 $labels['importfromfile'] = 'Importa des d\'un fitxer:';
 $labels['importtarget'] = 'Afegeix contactes nous a la llibreta d\'adreces:';
 $labels['importreplace'] = 'Reemplaﾃｧa la llibreta d\'adreﾃｧes sencera';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Podeu carregar contactes des d\'una llibreta de direccions.<br/>Actualment donem suport a la importaciﾃｳ d\'adreces des de fitxers de tipus <a href="http://ca.wikipedia.org/wiki/VCard">vCard</a> o CSV (valors separats per comes).';
 $labels['done'] = 'Fet';
 
 // settings
@@ -381,7 +385,7 @@ $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Joc de carﾃ�cters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
 $labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['digitalsig'] = 'Signatura digital';
 $labels['dateformat'] = 'Format de la data';
 $labels['timeformat'] = 'Format horari';
 $labels['prettydate'] = 'Dates curtes';
@@ -396,8 +400,9 @@ $labels['showinextwin'] = 'Obrir el missatge en una nova finestra';
 $labels['composeextwin'] = 'Redactar en una nova finestra';
 $labels['htmleditor'] = 'Escriu missatges en HTML';
 $labels['htmlonreply'] = 'nomﾃｩs en resposta a missatges en HTML';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'en reenviament o resposta a missatge HTML';
 $labels['htmlsignature'] = 'Signatura en HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostra el panell de previsualitzaciﾃｳ';
 $labels['skin'] = 'Aparenﾃｧa d\'interfﾃｭcie';
 $labels['logoutclear'] = 'Buida la paperera al tancar la sessiﾃｳ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Quan es contesti, suprimeix la signatura orig
 $labels['autoaddsignature'] = 'Afegeix la signatura automﾃ�ticament';
 $labels['newmessageonly'] = 'nomﾃｩs si ﾃｩs un missatge nou';
 $labels['replyandforwardonly'] = 'nomﾃｩs a respostes i reenviaments';
-$labels['replysignaturepos'] = 'Quan es contesti o reenviﾃｯ, posa-hi la signatura';
-$labels['belowquote'] = 'sota les cometes';
-$labels['abovequote'] = 'sobre les cometes';
 $labels['insertsignature'] = 'Inserta la signatura';
 $labels['previewpanemarkread']  = 'Marca els missatges previsualitzats com a llegits';
 $labels['afternseconds']  = 'desprﾃｩs de $n segons';
@@ -470,7 +472,7 @@ $labels['spellcheckignorenums'] = 'Ignora paraules amb nﾃｺmeros';
 $labels['spellcheckignorecaps'] = 'Ignora paraules amb lletres capitalitzades';
 $labels['addtodict'] = 'Afegeix al diccionari';
 $labels['mailtoprotohandler'] = 'Registra controlador de protocol pels enllaﾃｧos mailto:';
-$labels['forwardmode'] = 'Messages forwarding';
+$labels['forwardmode'] = 'Reenviament de missatges';
 $labels['inline'] = 'en lﾃｭnia';
 $labels['asattachment'] = 'com adjunt';
 
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index 5f0e1d609..70c3fbd0c 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -19,24 +19,26 @@
 $messages = array();
 $messages['errortitle']  = 'Hi ha hagut un error!';
 $messages['loginfailed']  = 'L\'accﾃｩs ha fallat.';
-$messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies';
-$messages['sessionerror'] = 'La vostra sessiﾃｳ no existeix o ha expirat';
-$messages['storageerror'] = 'Error de conexiﾃｳ amb el servidor IMAP';
+$messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies.';
+$messages['sessionerror'] = 'La vostra sessiﾃｳ no existeix o ha expirat.';
+$messages['storageerror'] = 'Error de connexiﾃｳ amb el servidor IMAP.';
 $messages['servererror'] = 'Error del Servidor!';
 $messages['servererrormsg'] = 'Error del Servidor: $msg';
 $messages['dberror'] = 'Error a la Base de Dades!';
 $messages['requesttimedout'] = 'S\'ha esgotat el temps de la solﾂｷlicitud';
 $messages['errorreadonly'] = 'Impossible de realitzar l\'operaciﾃｳ. La carpeta ﾃｩs de nomﾃｩs lectura.';
 $messages['errornoperm'] = 'Impossible de realitzar l\'operaciﾃｳ. Permﾃｭs denegat.';
-$messages['invalidrequest'] = 'Peticiﾃｳ no vﾃ�lida! No s\'ha desat les dades.';
+$messages['erroroverquota'] = 'No s\'ha pogut completar l\'operaciﾃｳ. No hi ha prou espai lliure al disc dur.';
+$messages['erroroverquotadelete'] = 'No hi ha prou espai lliure. Feu servir MAJﾃ售+SUPR per suprimir el missatge.';
+$messages['invalidrequest'] = 'Peticiﾃｳ no vﾃ�lida! No s\'han desat les dades.';
 $messages['invalidhost'] = 'Nom de servidor no vﾃ�lid.';
 $messages['nomessagesfound'] = 'No s\'han trobat missatges en aquesta bﾃｺstia.';
-$messages['loggedout'] = 'Heu tancat la sessiﾃｳ. A reveure!';
+$messages['loggedout'] = 'Heu tancat la sessiﾃｳ correctament. A reveure!';
 $messages['mailboxempty'] = 'La bﾃｺstia ﾃｩs buida.';
-$messages['refreshing'] = 'Refrescant...';
+$messages['refreshing'] = 'S\'estﾃ� refrescant...';
 $messages['loading'] = 'S\'estﾃ� carregant窶ｦ';
 $messages['uploading'] = 'S\'estﾃ� pujant el fitxer...';
-$messages['uploadingmany'] = 'S\'estﾃ� pujant els fitxers...';
+$messages['uploadingmany'] = 'S\'estan pujant els fitxers...';
 $messages['loadingdata'] = 'S\'estan carregant les dades...';
 $messages['checkingmail'] = 'S窶册stﾃ� comprovant si hi ha missatges nous窶ｦ';
 $messages['sendingmessage'] = 'S窶册stﾃ� enviant el missatge窶ｦ';
@@ -52,26 +54,26 @@ $messages['encryptedmessage'] = 'Aquest ﾃｩs un missatge xifrat i no pot ser most
 $messages['nocontactsfound'] = 'No s\'ha trobat cap contacte.';
 $messages['contactnotfound'] = 'No s\'ha trobat el contacte solﾂｷlicitat.';
 $messages['contactsearchonly'] = 'Introduﾃｯu termes de cerca per trobar contactes';
-$messages['sendingfailed'] = 'Error enviant missatge.';
+$messages['sendingfailed'] = 'Error enviant el missatge.';
 $messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge.';
 $messages['errorsavingsent'] = 'Hi ha hagut un error mentre es desava el missatge enviat.';
-$messages['errorsaving'] = 'Hi ha hagut un error mentre es desava.';
+$messages['errorsaving'] = 'Hi ha hagut un error mentre s\'estava desant.';
 $messages['errormoving'] = 'No s\'ha pogut moure el(s) missatge(s).';
 $messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s).';
-$messages['errordeleting'] = 'No s\'ha pogut suprimir el missatge.';
+$messages['errordeleting'] = 'No s\'ha pogut suprimir el(s) missatge(s).';
 $messages['errormarking'] = 'No s\'ha pogut marcar el(s) missatge(s).';
-$messages['deletecontactconfirm']  = 'Esteu segurs de voler suprimir el(s) contacte(s) selecionat(s)?';
-$messages['deletegroupconfirm']  = 'Esteu segurs de voler suprimirr el grup seleccionat?';
-$messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) selecionat(s)?';
+$messages['deletecontactconfirm']  = 'Esteu segurs de voler suprimir el(s) contacte(s) seleccionat(s)?';
+$messages['deletegroupconfirm']  = 'Esteu segurs de voler suprimir el grup seleccionat?';
+$messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) seleccionat(s)?';
 $messages['deletefolderconfirm']  = 'Esteu segurs de voler suprimir aquesta carpeta?';
 $messages['purgefolderconfirm']  = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
 $messages['contactdeleting'] = 'S\'estﾃ� suprimint els contacte(s)...';
 $messages['groupdeleting'] = 'S\'estﾃ� suprimint el grup...';
 $messages['folderdeleting'] = 'S\'estﾃ� suprimint la carpeta...';
 $messages['foldermoving'] = 'S\'estﾃ� movent la carpeta...';
-$messages['foldersubscribing'] = 'S\'estﾃ� subscribint la carpeta...';
-$messages['folderunsubscribing'] = 'S\'estﾃ� cancelant la subscripciﾃｳ de la carpeta...';
-$messages['formincomplete'] = 'El formulari no ha estat emplenat totalment.';
+$messages['foldersubscribing'] = 'S\'estﾃ� subscrivint la carpeta...';
+$messages['folderunsubscribing'] = 'S\'estﾃ� cancelﾂｷlant la subscripciﾃｳ de la carpeta...';
+$messages['formincomplete'] = 'El formulari no ha estat emplenat completament.';
 $messages['noemailwarning'] = 'Si us plau, introduﾃｯu una adreﾃｧa de correu electrﾃｲnic vﾃ�lida.';
 $messages['nonamewarning']  = 'Si us plau, introduﾃｯu un nom.';
 $messages['nopagesizewarning'] = 'Si us plau, introduﾃｯu una mida de pﾃ�gina.';
@@ -91,11 +93,11 @@ $messages['checking'] = 'S\'estﾃ� comprovant...';
 $messages['nospellerrors'] = 'No s\'han trobat errors d\'ortografia.';
 $messages['folderdeleted'] = 'Carpeta suprimida correctament.';
 $messages['foldersubscribed'] = 'Carpeta subscrita correctament.';
-$messages['folderunsubscribed'] = 'Carpeta desubscrita correctament.';
+$messages['folderunsubscribed'] = 'Carpeta de-subscrita correctament.';
 $messages['folderpurged'] = 'La carpeta ha estat buidada correctament.';
 $messages['folderexpunged'] = 'La carpeta ha estat compactada correctament.';
 $messages['deletedsuccessfully'] = 'Suprimit correctament.';
-$messages['converting'] = 'S\'estﾃ� traient format del missatge...';
+$messages['converting'] = 'S\'estﾃ� traient el format del missatge...';
 $messages['messageopenerror'] = 'No s\'ha pogut carregar el missatge del servidor.';
 $messages['fileuploaderror'] = 'La pujada del fitxer ha fallat.';
 $messages['filesizeerror'] = 'El fitxer pujat excedeix la mida mﾃ�xima de $size.';
@@ -103,13 +105,13 @@ $messages['copysuccess'] = 'S\'han copiat $nr adreces correctament.';
 $messages['copyerror'] = 'No s\'ha pogut copiar cap adreﾃｧa.';
 $messages['sourceisreadonly'] = 'Aquesta adreﾃｧa ﾃｩs nomﾃｩs de lectura.';
 $messages['errorsavingcontact'] = 'No s\'ha pogut desar l\'adreﾃｧa de contacte.';
-$messages['movingmessage'] = 'S\'estﾃ� movent el missatge...';
-$messages['copyingmessage'] = 'S\'estﾃ� copiant missatge...';
-$messages['copyingcontact'] = 'S\'estﾃ� copiant els contacte(s)...';
-$messages['deletingmessage'] = 'S\'estﾃ� suprimint els missatge(s)...';
-$messages['markingmessage'] = 'S\'estﾃ� marcant els missatge(s)...';
-$messages['addingmember'] = 'S\'estﾃ� afegint els contacte(s) al grup...';
-$messages['removingmember'] = 'S\'estﾃ� suprimint els contacte(s) del grup...';
+$messages['movingmessage'] = 'S\'estﾃ� movent missatge(s)...';
+$messages['copyingmessage'] = 'S\'estﾃ� copiant missatge(s)...';
+$messages['copyingcontact'] = 'S\'estﾃ� copiant contacte(s)...';
+$messages['deletingmessage'] = 'S\'estﾃ� suprimint missatge(s)...';
+$messages['markingmessage'] = 'S\'estﾃ� marcant missatge(s)...';
+$messages['addingmember'] = 'S\'estﾃ� afegint contacte(s) al grup...';
+$messages['removingmember'] = 'S\'estﾃ� suprimint contacte(s) del grup...';
 $messages['receiptsent'] = 'Confirmaciﾃｳ de lectura enviada correctament.';
 $messages['errorsendingreceipt'] = 'No es pot enviar la confirmaciﾃｳ.';
 $messages['deleteidentityconfirm'] = 'Esteu segurs de voler suprimir aquesta identitat?';
@@ -132,16 +134,16 @@ $messages['smtpconnerror'] = 'Error SMTP ($code): La connexiﾃｳ al servidor ha fa
 $messages['smtpautherror'] = 'Error SMTP ($code): La identificaciﾃｳ ha fallat.';
 $messages['smtpfromerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$from" com a remitent ($msg).';
 $messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a destinatari ($msg).';
-$messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la lista de destinataris.';
+$messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la llista de destinataris.';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Adreﾃｧa de correu no vﾃ�lida: $email';
 $messages['toomanyrecipients'] = 'Massa destinataris. Reduﾃｯu el nombre de destinataris a $max.';
 $messages['maxgroupmembersreached'] = 'El nombre de membres del grup excedeix el mﾃ�xim de $max.';
 $messages['internalerror'] = 'Hi ha hagut un error intern. Si us plau torneu-ho a provar.';
-$messages['contactdelerror'] = 'No s\'ha pogut suprimir el(s) contacte(s).';
-$messages['contactdeleted'] = 'Contacte(s) suprimits(s) correctament.';
-$messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimits(s).';
-$messages['contactrestored'] = 'Contacte(s) restaurats correctament.';
+$messages['contactdelerror'] = 'No s\'han pogut suprimir el(s) contacte(s).';
+$messages['contactdeleted'] = 'Contacte(s) suprimit(s) correctament.';
+$messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimit(s).';
+$messages['contactrestored'] = 'Contacte(s) restaurat(s) correctament.';
 $messages['groupdeleted'] = 'Grup suprimit correctament.';
 $messages['grouprenamed'] = 'Grup reanomenat correctament.';
 $messages['groupcreated'] = 'Grup creat correctament.';
@@ -149,7 +151,7 @@ $messages['savedsearchdeleted'] = 'S\'ha suprimit correctament la cerca desada.'
 $messages['savedsearchdeleteerror'] = 'No s\'ha pogut suprimit la cerca desada.';
 $messages['savedsearchcreated'] = 'S\'ha creat correctament la cerca desada.';
 $messages['savedsearchcreateerror'] = 'No s\'ha pogut crear la cerca desada.';
-$messages['messagedeleted'] = 'Missatge(s) suprimits(s) correctament.';
+$messages['messagedeleted'] = 'Missatge(s) suprimit(s) correctament.';
 $messages['messagemoved'] = 'Missatge(s) mogut(s) correctament.';
 $messages['messagecopied'] = 'Missatge(s) copiat(s) correctament.';
 $messages['messagemarked'] = 'Missatge(s) marcat(s) correctament.';
@@ -160,10 +162,10 @@ $messages['nametoolong'] = 'El nom ﾃｩs massa llarg.';
 $messages['folderupdated'] = 'La carpeta ha estat actualitzada correctament.';
 $messages['foldercreated'] = 'La carpeta ha estat creada correctament.';
 $messages['invalidimageformat'] = 'No ﾃｩs un format d\'imatge vﾃ�lid.';
-$messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al misstage.';
+$messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al missatge.';
 $messages['parentnotwritable'] = 'No s\'ha pogut crear/moure la carpeta dins de la carpeta ascendent seleccionada. No hi ha permisos d\'escriptura.';
 $messages['messagetoobig'] = 'La part del missatge ﾃｩs massa gran per processar-la.';
-$messages['attachmentvalidationerror'] = 'ATENCIﾃ�! Aquest adjunt ﾃｩs sospitﾃｳs perquﾃｨ el seu tipus no coincideix amb el tipus declarat al missatge. Si no confies en l\'emissor, no l\'hauries d\'obrir al navegador perquﾃｨ pot contenir elements maliciosos. <br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Atenciﾃｳ: Aquest client de correu necessita Javascript! Per a poder fer-lo servir, has d\'activar Javascript a les opcions del navegador.';
+$messages['attachmentvalidationerror'] = 'ATENCIﾃ�! Aquest adjunt ﾃｩs sospitﾃｳs perquﾃｨ el seu tipus no coincideix amb el tipus declarat al missatge. Si no confieu en l\'emissor, no l\'haurﾃｭeu d\'obrir al navegador perquﾃｨ pot contenir elements maliciosos. <br/><br/><em>S\'esperava: $expected; s\'ha trobat: $detected</em>';
+$messages['noscriptwarning'] = 'Atenciﾃｳ: Aquest client de correu necessita Javascript! Per a poder fer-lo servir, heu d\'activar Javascript a les opcions del navegador.';
 
 ?>
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 9f8dc1870..8fb7ffade 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopﾃｭrovat';
 $labels['move']     = 'Pﾅ册sunout';
 $labels['moveto']   = 'pﾅ册sunout do...';
 $labels['download'] = 'stﾃ｡hnout';
+$labels['open']     = 'Otevﾅ凖ｭt';
 $labels['showattachment'] = 'Zobrazit';
 $labels['showanyway'] = 'Pﾅ册sto zobrazit';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuﾃ｡lnﾃｭ strﾃ｡nka';
 $labels['unread'] = 'Nepﾅ册ﾄ衡enﾃｩ';
 $labels['flagged'] = 'Oznaﾄ稿nﾃｩ';
 $labels['unanswered'] = 'Neoznaﾄ稿nﾃｩ';
+$labels['withattachment'] = 'S pﾅ凖ｭlohou';
 $labels['deleted'] = 'Smazanﾃｩ';
 $labels['undeleted'] = 'Nesmazﾃ｡no';
 $labels['invert'] = 'Pﾅ册vrﾃ｡tit';
@@ -204,6 +206,8 @@ $labels['body']  = 'Tﾄ嬪o';
 
 $labels['openinextwin'] = 'Otevﾅ凖ｭt v novﾃｩm oknﾄ�';
 $labels['emlsave'] = 'Stﾃ｡hnout (.eml)';
+$labels['changeformattext'] = 'Zobrazit v textovﾃｩm formﾃ｡tu';
+$labels['changeformathtml'] = 'Zobrazit v HTML formﾃ｡tu';
 
 // message compose
 $labels['editasnew']      = 'Upravit jako novou';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Poslat e-mail';
 $labels['contactsfromto'] = 'Kontakty $from aﾅｾ $to z celkem $count';
 $labels['print']          = 'Tisk';
 $labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Export vﾅ｡ech';
+$labels['exportsel']      = 'Export vybranﾃｽch';
 $labels['exportvcards']   = 'Exportovat kontakty ve formﾃ｡tu vCard';
 $labels['newcontactgroup'] = 'Vytvoﾅ冓t novou skupinu kontaktﾅｯ';
 $labels['grouprename']    = 'Pﾅ册jmenovat skupinu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Vytvﾃ｡ﾅ册t HTML zprﾃ｡vy';
 $labels['htmlonreply'] = 'jen pﾅ冓 odpovﾄ嫖i na HTML zprﾃ｡vy';
 $labels['htmlonreplyandforward'] = 'pﾅ冓 pﾅ册poslﾃ｡nﾃｭ nebo odpovﾄ嫖i na HTML zprﾃ｡vu';
 $labels['htmlsignature'] = 'HTML podpis';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Zobrazit panel nﾃ｡hledu';
 $labels['skin'] = 'Vzhled';
 $labels['logoutclear'] = 'Vyprﾃ｡zdnit koﾅ｡ pﾅ冓 odhlﾃ｡ﾅ｡enﾃｭ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Pﾅ冓 odpovﾃｭdﾃ｡nﾃｭ odstranit ze zprﾃ｡vy pﾅｯvo
 $labels['autoaddsignature'] = 'Automaticky pﾅ冓dat podpis';
 $labels['newmessageonly'] = 'pouze k novﾃｽm zprﾃ｡vﾃ｡m';
 $labels['replyandforwardonly'] = 'jen k odpovﾄ嫖i a pﾅ册posﾃｭlanﾃｩ zprﾃ｡vﾄ�';
-$labels['replysignaturepos'] = 'Pﾅ冓 odpovﾃｭdﾃ｡nﾃｭ nebo pﾅ册posﾃｭlﾃ｡nﾃｭ zprﾃ｡vy vloﾅｾit podpis';
-$labels['belowquote'] = 'pod citaci';
-$labels['abovequote'] = 'nad citaci';
 $labels['insertsignature'] = 'Vloﾅｾit podpis';
 $labels['previewpanemarkread']  = 'Oznaﾄ絞t zobrazenﾃｩ zprﾃ｡vy jako pﾅ册ﾄ衡enﾃｩ';
 $labels['afternseconds']  = 'po $n sekundﾃ｡ch';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index cee1bd09a..9800b2412 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Chyba v databﾃ｡zi!';
 $messages['requesttimedout'] = 'Doﾅ｡lo k vyprﾅ｡enﾃｭ poﾅｾadavku';
 $messages['errorreadonly'] = 'Pﾅ凖ｭkaz nelze provﾃｩst, sloﾅｾka je urﾄ稿na jen ke ﾄ衡enﾃｭ.';
 $messages['errornoperm'] = 'Pﾅ凖ｭkaz nelze provﾃｩst, nemﾃ｡te oprﾃ｡vnﾄ嬾ﾃｭ.';
+$messages['erroroverquota'] = 'Pﾅ凖ｭkaz nelze provﾃｩst, nenﾃｭ volnﾃｩ mﾃｭsto na disku.';
+$messages['erroroverquotadelete'] = 'Nenﾃｭ volnﾃｩ mﾃｭsto na disku. Pouﾅｾijte SHIFT+DEL k odstranﾄ嬾ﾃｭ zprﾃ｡vy.';
 $messages['invalidrequest'] = 'Nesprﾃ｡vnﾃｽ poﾅｾadavek. Data nebyla uloﾅｾena.';
 $messages['invalidhost'] = 'ﾅ�patnﾃｩ jmﾃｩno serveru.';
 $messages['nomessagesfound'] = 'Ve schrﾃ｡nce nebyla nalezena ﾅｾﾃ｡dnﾃ｡ zprﾃ｡va';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index c6cf2344a..3e4f136bc 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copio';
 $labels['move']     = 'Symud';
 $labels['moveto']   = 'Symud i...';
 $labels['download'] = 'Llwytho lawr';
+$labels['open']     = 'Agor';
 $labels['showattachment'] = 'Dangos';
 $labels['showanyway'] = 'Dangos beth bynnag';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Tudalen gyfredol';
 $labels['unread'] = 'Heb eu darllen';
 $labels['flagged'] = 'Nodwyd';
 $labels['unanswered'] = 'Heb ei ateb';
+$labels['withattachment'] = 'Gyda atodiad';
 $labels['deleted'] = 'Dilewyd';
 $labels['undeleted'] = 'Heb ei ddileu';
 $labels['invert'] = 'Gwrth-droi';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corff';
 
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
+$labels['changeformattext'] = 'Dangos mewn fformat testun plaen';
+$labels['changeformathtml'] = 'Dangos mewn fformat HTML';
 
 // message compose
 $labels['editasnew']      = 'Golygu fel neges newydd';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Ysgrifennu neges at';
 $labels['contactsfromto'] = 'Cysylltiadau $from i $to o $count';
 $labels['print']          = 'Argraffu';
 $labels['export']         = 'Allforio';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Allforio popeth';
+$labels['exportsel']      = 'Allforio dewiswyd';
 $labels['exportvcards']   = 'Allforio cysylltiadau mewn fformat vCard';
 $labels['newcontactgroup'] = 'Creu grﾅｵp cysylltiadau newydd';
 $labels['grouprename']    = 'Ail-enwi grﾅｵp';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Ysgrifennu negeseuon HTML';
 $labels['htmlonreply'] = 'wrth ateb i neges HTML yn unig';
 $labels['htmlonreplyandforward'] = 'wrth ddanfon ymlaen neu ymateb i neges HTML';
 $labels['htmlsignature'] = 'Llofnod HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Dangos ffenest rhagolwg';
 $labels['skin'] = 'Croen rhyngwyneb';
 $labels['logoutclear'] = 'Clirio\'r Sbwriel wrth allgofnodi';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Wrth ateb, dileu\'r llofnod gwreiddiol o\'r n
 $labels['autoaddsignature'] = 'Ychwanegu llofnod yn awtomatig';
 $labels['newmessageonly'] = 'negeseuon newydd yn unig';
 $labels['replyandforwardonly'] = 'atebion a danfon ymlaen yn unig';
-$labels['replysignaturepos'] = 'Wrth ateb neu ddanfon ymlaen, rhoi\'r llofnod';
-$labels['belowquote'] = 'o dan y dyfynniad';
-$labels['abovequote'] = 'uwchben y dyfynniad';
 $labels['insertsignature'] = 'Mewnosod llofnod';
 $labels['previewpanemarkread']  = 'Nodi negeseuon rhagolwg fel darllenwyd';
 $labels['afternseconds']  = 'ar ﾃｴl $n eiliad';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 553422948..edadc3b45 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Gwall Cronfa Ddata!';
 $messages['requesttimedout'] = 'Cais wedi dod i derfyn amser';
 $messages['errorreadonly'] = 'Methwyd gweithredu. Mae\'r ffolder yn darllen-yn-unig';
 $messages['errornoperm'] = 'Methwyd gweithredu. Gwrthodwyd caniatad';
+$messages['erroroverquota'] = 'Methwyd gweithredu. Nid oes gofod gwag ar y disg.';
+$messages['erroroverquotadelete'] = 'Dim gofod gwag ar y disg. Defnyddiwch SHIFT+DEL i ddileu neges.';
 $messages['invalidrequest'] = 'Cais annilys! Ni chadwyd unrhyw wybodaeth.';
 $messages['invalidhost'] = 'Enw gweinydd annilys.';
 $messages['nomessagesfound'] = 'Dim negeseuon wedi eu canfod yn y blwch hwn';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 93209b869..02d7dd9e3 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiﾃｩr';
 $labels['move']     = 'Flyt';
 $labels['moveto']   = 'Flyt til...';
 $labels['download'] = 'Download';
+$labels['open']     = 'ﾃ�ben';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis alligevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuel side';
 $labels['unread'] = 'Ulﾃｦste';
 $labels['flagged'] = 'Markeret';
 $labels['unanswered'] = 'Ubesvaret';
+$labels['withattachment'] = 'Med vedhﾃｦftning';
 $labels['deleted'] = 'Slettede';
 $labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Invertﾃｩr';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'ﾃ�bn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Vis i ren tekst format';
+$labels['changeformathtml'] = 'Vis i HTML format';
 
 // message compose
 $labels['editasnew']      = 'Redigﾃｩr som ny';
@@ -243,7 +247,7 @@ $labels['alwaysshow'] = 'Vis altid billeder fra $sender';
 $labels['isdraft']    = 'Dette er en kladde.';
 $labels['andnmore']   = '$nr yderligere...';
 $labels['togglemoreheaders'] = 'Vis yderligere headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = 'ﾃ�ndre rﾃ･ brevhoveder';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Almindelig tekst';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Skriv besked til';
 $labels['contactsfromto'] = 'Kontakter $from til $to af $count';
 $labels['print']          = 'Udskriv';
 $labels['export']         = 'Eksportﾃｩr';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Eksporter alt';
+$labels['exportsel']      = 'Eksporter udvalgte';
 $labels['exportvcards']   = 'Eksportﾃｩr kontakter i vCard format';
 $labels['newcontactgroup'] = 'Opret ny kontaktgruppe';
 $labels['grouprename']    = 'Omdﾃｸb gruppe';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Skriv HTML-besked';
 $labels['htmlonreply'] = 'kun nﾃ･r jeg besvarer HTML-beskeder';
 $labels['htmlonreplyandforward'] = 'ved videresendelse eller besvarelse af HTML beskeder';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Forhﾃ･ndsvisning';
 $labels['skin'] = 'Brugerflade';
 $labels['logoutclear'] = 'Tﾃｸm Papirkurv nﾃ･r jeg logger af';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Fjern original signatur fra besked, nﾃ･r der
 $labels['autoaddsignature'] = 'Indsﾃｦt automatisk signatur';
 $labels['newmessageonly'] = 'kun pﾃ･ nye beskeder';
 $labels['replyandforwardonly'] = 'kun pﾃ･ svar og videresendelse af beskeder';
-$labels['replysignaturepos'] = 'Nﾃ･r beskeder besvares eller videresendes; indsﾃｦt signatur';
-$labels['belowquote'] = 'under det citerede';
-$labels['abovequote'] = 'over det citerede';
 $labels['insertsignature'] = 'Indsﾃｦt signatur';
 $labels['previewpanemarkread']  = 'Markﾃｩr forhﾃ･ndsviste beskeder som lﾃｦst';
 $labels['afternseconds']  = 'efter $n sekunder';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 6b8ce1928..9a0b8e4a5 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database fejl!';
 $messages['requesttimedout'] = 'Forespﾃｸrgselstiden udlﾃｸb';
 $messages['errorreadonly'] = 'Kunne ikke udfﾃｸre den ﾃｸnskede handling. Mappen er skrivebeskyttet.';
 $messages['errornoperm'] = 'Kunne ikke udfﾃｸre den ﾃｸnskede handling. Adgang nﾃｦgtet.';
+$messages['erroroverquota'] = 'Kan ikke udfﾃｸre handlingen. Der er ikke nok ledig diskplads.';
+$messages['erroroverquotadelete'] = 'Der er ikke nok ledig diskplads. Brug SHIFT+DEL til at slette en meddelelse.';
 $messages['invalidrequest'] = 'Ugyldig forespﾃｸrgsel! Ingen data blev gemt.';
 $messages['invalidhost'] = 'Ugyldigt servernavn.';
 $messages['nomessagesfound'] = 'Der blev ikke fundet nogen beskeder i denne postkasse.';
@@ -163,7 +165,7 @@ $messages['invalidimageformat'] = 'Ikke et gyldigt billedformat.';
 $messages['mispellingsfound'] = 'Der er fundet stavefejl i beskeden.';
 $messages['parentnotwritable'] = 'Kan ikke oprette/flytte mappe ind i valgt mappe. Ingen adgangsrettigheder.';
 $messages['messagetoobig'] = 'Denne del af beskeden er for stor til at blive behandlet.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['attachmentvalidationerror'] = 'ADVARSEL! Den vedhﾃｦftede fil er mistﾃｦnkelig - Typen stemmer ikke overens med den oplyste type. Hvis du ikke har tillid til afsender, skal du ikke ﾃ･bne filen da den kan indholde onsindet indhold. <br/><br/><em>Forventet: $expected; Fundet: $detected</em>';
 $messages['noscriptwarning'] = 'Advarsel: Denne webmailclient krﾃｦver Javascript! For at kunne bruge den slﾃ･ venligst Javascripts til i din browserindstillinger.';
 
 ?>
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 31444b6c1..bea939d3d 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieren';
 $labels['move']     = 'Verschieben';
 $labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Download';
+$labels['open']     = 'ﾃ貿fnen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
+$labels['withattachment'] = 'Mit Anhang';
 $labels['deleted'] = 'Gelﾃｶschte';
 $labels['undeleted'] = 'Nicht gelﾃｶscht';
 $labels['invert'] = 'Umkehren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Inhalt';
 
 $labels['openinextwin'] = 'In neuem Fenster ﾃｶffnen';
 $labels['emlsave'] = 'Herunterladen (.eml)';
+$labels['changeformattext'] = 'Als reiner Text anzeigen';
+$labels['changeformathtml'] = 'Als original HTML anzeigen';
 
 // message compose
 $labels['editasnew']      = 'Als neue Nachricht ﾃｶffnen';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML-Nachrichten verfassen';
 $labels['htmlonreply'] = 'nur Antworten auf HTML-Nachrichten';
 $labels['htmlonreplyandforward'] = 'Antworten oder Weiterleiten einer HTML-Nachricht';
 $labels['htmlsignature'] = 'HTML-Signatur';
+$labels['showemail'] = 'E-Mail-Adresse und Namen anzeigen';
 $labels['previewpane'] = 'Nachrichtenvorschau anzeigen';
 $labels['skin'] = 'Oberflﾃ､chendesign';
 $labels['logoutclear'] = 'Papierkorb beim Abmelden leeren';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Beim Antworten die Signatur der Originalnachr
 $labels['autoaddsignature'] = 'Signatur automatisch einfﾃｼgen';
 $labels['newmessageonly'] = 'nur bei neuen Nachrichten';
 $labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
-$labels['replysignaturepos'] = 'Beim Antworten oder Weiterleiten die Signatur';
-$labels['belowquote'] = 'unter der Originalnachricht einfﾃｼgen';
-$labels['abovequote'] = 'ﾃｼber der Originalnachricht einfﾃｼgen';
 $labels['insertsignature'] = 'Signatur einfﾃｼgen';
 $labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
 $labels['afternseconds']  = 'nach $n Sekunden';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 027e2ee06..f3697a825 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Datenbankfehler!';
 $messages['requesttimedout'] = 'Zeitlimit ﾃｼberschritten';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgefﾃｼhrt werden. Der Ordner ist schreibgeschﾃｼtzt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgefﾃｼhrt werden. Zugriff verweigert.';
+$messages['erroroverquota'] = 'Die Aktion kann nicht ausgefﾃｼhrt werden. Keine freier Speicherplatz.';
+$messages['erroroverquotadelete'] = 'Kein freier Speicherplatz. Drﾃｼcken Sie SHIFT+DEL um die Nachricht zu lﾃｶschen.';
 $messages['invalidrequest'] = 'Ungﾃｼltige Anfrage! Es wurden keine Daten gespeichert.';
 $messages['invalidhost'] = 'Ungﾃｼltiger Servername';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 6ce679caa..376376dad 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieren';
 $labels['move']     = 'Verschieben';
 $labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Herunterladen';
+$labels['open']     = 'Offen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
+$labels['withattachment'] = 'Mit Anhang';
 $labels['deleted'] = 'Gelﾃｶschte';
 $labels['undeleted'] = 'Nicht gelﾃｶscht';
 $labels['invert'] = 'Invertieren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Inhalt';
 
 $labels['openinextwin'] = 'In neuem Fenster ﾃｶffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
+$labels['changeformattext'] = 'Als reiner Text anzeigen';
+$labels['changeformathtml'] = 'Als original HTML anzeigen';
 
 // message compose
 $labels['editasnew']      = 'Als neue Nachricht ﾃｶffnen';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML-Nachrichten verfassen';
 $labels['htmlonreply'] = 'nur Antworten auf HTML-Nachrichten';
 $labels['htmlonreplyandforward'] = 'beim Weiterleiten und  Beantworten auf HTML-Nachrichten';
 $labels['htmlsignature'] = 'HTML-Signatur';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Nachrichtenvorschau anzeigen';
 $labels['skin'] = 'Oberflﾃ､chendesign';
 $labels['logoutclear'] = 'Papierkorb beim Abmelden leeren';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Beim Antworten Signatur der Originalnachricht
 $labels['autoaddsignature'] = 'Signatur automatisch einfﾃｼgen';
 $labels['newmessageonly'] = 'nur bei neuen Nachrichten';
 $labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
-$labels['replysignaturepos'] = 'Beim Antworten die Signatur';
-$labels['belowquote'] = 'unter der Originalnachricht einfﾃｼgen';
-$labels['abovequote'] = 'ﾃｼber der Originalnachricht einfﾃｼgen';
 $labels['insertsignature'] = 'Signatur einfﾃｼgen';
 $labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
 $labels['afternseconds']  = 'nach $n Sekunden';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index eeaba7db2..ba0936d28 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Datenbankfehler!';
 $messages['requesttimedout'] = 'Zeitﾃｼberschreitung der Anforderung';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgefﾃｼhrt werden. Der Ordner ist schreibgeschﾃｼtzt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgefﾃｼhrt werden. Zugriff verweigert.';
+$messages['erroroverquota'] = 'Die Aktion kann nicht ausgefﾃｼhrt werden. Nicht genug freier Speicherplatz.';
+$messages['erroroverquotadelete'] = 'Nicht genug freier Speicherplatz. Verwenden sie SHIFT+ENTF um Nachrichten zu lﾃｶschen.';
 $messages['invalidrequest'] = 'Ungﾃｼltige Anfrage! Es wurden keine Daten gespeichert.';
 $messages['invalidhost'] = 'Ungﾃｼltiger Server Name';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner.';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 208164779..9f5d81839 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾎ対ｽﾏ�ﾎｹﾎｳﾏ∃ｱﾏ�ﾎｮ';
 $labels['move']     = 'ﾎ慚ｵﾏ�ﾎｱﾎｺﾎｯﾎｽﾎｷﾏπｷ';
 $labels['moveto']   = 'ﾎ慚ｵﾏ�ﾎｱﾎｺﾎｯﾎｽﾎｷﾏπｷ ﾏπｵ...';
 $labels['download'] = 'ﾎ嶄ｮﾏ夷ｷ';
+$labels['open']     = 'ﾎ対ｽﾎｿﾎｹﾎｳﾎｼﾎｱ';
 $labels['showattachment'] = 'ﾎ偏ｼﾏ�ﾎｬﾎｽﾎｹﾏπｷ';
 $labels['showanyway'] = 'ﾎ偏ｼﾏ�ﾎｬﾎｽﾎｹﾏπｷ';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾎ､ﾏ∃ｭﾏ�ﾎｿﾏ�ﾏπｱ ﾏπｵﾎｻﾎｯﾎｴﾎｱ';
 $labels['unread'] = 'ﾎ慚ｷ ﾎｱﾎｽﾎｱﾎｳﾎｽﾏ珂πｼﾎｭﾎｽﾎｿ';
 $labels['flagged'] = 'ﾎ｣ﾎｷﾎｼﾎｵﾎｹﾏ火ｼﾎｭﾎｽﾎｿ';
 $labels['unanswered'] = 'ﾎ対ｽﾎｱﾏ�ﾎｬﾎｽﾏ�ﾎｷﾏ�ﾎｿ';
+$labels['withattachment'] = 'ﾎ慚ｵ ﾎｵﾏ�ﾎｹﾏρ歳ｽﾎｱﾏ夷ｷ';
 $labels['deleted'] = 'ﾎ釆ｹﾎｵﾎｳﾏ∃ｱﾎｼﾎｼﾎｭﾎｽﾎｿ';
 $labels['undeleted'] = 'ﾎ慚ｷ ﾎｴﾎｹﾎｵﾎｳﾏ∃ｱﾎｼﾎｼﾎｭﾎｽﾎｿ';
 $labels['invert'] = 'ﾎ対ｽﾎｱﾏρ�ﾏ∃ｿﾏ�ﾎｮ';
@@ -204,6 +206,8 @@ $labels['body']  = 'ﾎ｣ﾏ斜ｼﾎｱ';
 
 $labels['openinextwin'] = 'ﾎ�ﾎｽﾎｿﾎｹﾎｳﾎｼﾎｱ ﾏπｵ ﾎｽﾎｭﾎｿ ﾏ�ﾎｱﾏ∃ｬﾎｸﾏ�ﾏ∃ｿ';
 $labels['emlsave'] = 'ﾎ嶄ｮﾏ夷ｷ ﾎｱﾏ�ﾏ�ﾎｵﾎｯﾎｿﾏ� (.eml)';
+$labels['changeformattext'] = 'ﾎ偏ｼﾏ�ﾎｬﾎｽﾎｹﾏπｷ ﾏπｵ ﾎｼﾎｿﾏ�ﾏ�ﾎｮ ﾎｱﾏ�ﾎｻﾎｿﾏ� ﾎｺﾎｵﾎｹﾎｼﾎｭﾎｽﾎｿﾏ�';
+$labels['changeformathtml'] = 'ﾎ偏ｼﾏ�ﾎｬﾎｽﾎｹﾏπｷ ﾏπｵ ﾎｼﾎｿﾏ�ﾏ�ﾎｮ HTML';
 
 // message compose
 $labels['editasnew']      = 'ﾎ変�ﾎｵﾎｾﾎｵﾏ∃ｳﾎｱﾏπｯﾎｱ ﾏπｱﾎｽ ﾎｽﾎｭﾎｿ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾎ釆ｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｯﾎｱ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ� ﾏπｵ ﾎｼﾎｿﾏ�ﾏ�ﾎｮ
 $labels['htmlonreply'] = 'ﾎｼﾏ湖ｽﾎｿ ﾏπｵ ﾎｱﾏ�ﾎｬﾎｽﾏ�ﾎｷﾏπｷ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｿﾏ� ﾎｼﾎｿﾏ�ﾏ�ﾎｮﾏ� HTML';
 $labels['htmlonreplyandforward'] = 'ﾏπｵ ﾏ�ﾏ∃ｿﾏ斜ｸﾎｷﾏπｷ ﾎｮ ﾏπｵ ﾎｱﾏ�ﾎｬﾎｽﾏ�ﾎｷﾏπｷ ﾏπｵ HTML ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ';
 $labels['htmlsignature'] = 'ﾎ･ﾏ�ﾎｿﾎｳﾏ∃ｱﾏ�ﾎｮ HTML';
+$labels['showemail'] = 'ﾎ偏ｼﾏ�ﾎｬﾎｽﾎｹﾏπｷ ﾎｴﾎｹﾎｵﾏ歳ｸﾏ�ﾎｽﾏπｷﾏ� e-mail ﾎｼﾎｵ ﾏ�ﾎｿ ﾎｵﾎｼﾏ�ﾎｱﾎｽﾎｹﾎｶﾏ湖ｼﾎｵﾎｽﾎｿ ﾏ湖ｽﾎｿﾎｼﾎｱ';
 $labels['previewpane'] = 'ﾎ偏ｼﾏ�ﾎｬﾎｽﾎｹﾏπｷ ﾏ�ﾏ∃ｿﾎｵﾏ�ﾎｹﾏπｺﾏ狐�ﾎｷﾏπｷﾏ�';
 $labels['skin'] = 'ﾎ佩ｭﾎｼﾎｱ ﾎｵﾎｼﾏ�ﾎｬﾎｽﾎｹﾏπｷﾏ�';
 $labels['logoutclear'] = 'ﾎ�ﾎｴﾎｵﾎｹﾎｱﾏπｼﾎｱ ﾏ�ﾎｿﾏ� ﾎｺﾎｬﾎｴﾎｿﾏ� ﾏρ�ﾎｷﾎｽ ﾎｭﾎｾﾎｿﾎｴﾎｿ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾎ狐�ﾎｱﾎｽ ﾏ�ﾎｿ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｱﾏ�ﾎｬﾎ
 $labels['autoaddsignature'] = 'ﾎ� ﾏ�ﾏ�ﾎｿﾎｳﾏ∃ｱﾏ�ﾎｮ ﾎｽﾎｱ ﾏ�ﾏ∃ｿﾏρ�ﾎｯﾎｸﾎｵﾏ�ﾎｱﾎｹ ﾎｱﾏ�ﾏ�ﾏ湖ｼﾎｱﾏ�ﾎｱ';
 $labels['newmessageonly'] = 'ﾎｼﾏ湖ｽﾎｿ ﾏρ�ﾎｱ ﾎｽﾎｭﾎｱ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｱ';
 $labels['replyandforwardonly'] = 'ﾎｼﾏ湖ｽﾎｿ ﾏρ�ﾎｹﾏ� ﾎｱﾏ�ﾎｱﾎｽﾏ�ﾎｮﾏπｵﾎｹﾏ� ﾎｺﾎｱﾎｹ ﾏ�ﾏ∃ｿﾏ火ｸﾎｮﾏπｵﾎｹﾏ�';
-$labels['replysignaturepos'] = 'ﾎ狐�ﾎｱﾎｽ ﾎｳﾎｯﾎｽﾎｵﾏ�ﾎｱﾎｹ ﾎｱﾏ�ﾎｬﾎｽﾏ�ﾎｷﾏπｷ ﾎｮ ﾏ�ﾏ∃ｿﾏ斜ｸﾎｷﾏπｷ, ﾎｷ ﾏ�ﾏ�ﾎｿﾎｳﾏ∃ｱﾏ�ﾎｮ ﾎｽﾎｱ ﾏ�ﾎｿﾏ�ﾎｿﾎｸﾎｵﾏ�ﾎｵﾎｯﾏ�ﾎｵ';
-$labels['belowquote'] = 'ﾏ�ﾎｬﾎｽﾏ� ﾎｱﾏ�ﾏ� ﾏ�ﾎｷﾎｽ ﾏ�ﾎｱﾏ∃ｬﾎｸﾎｵﾏπｷ';
-$labels['abovequote'] = 'ﾎｺﾎｬﾏ�ﾏ� ﾎｱﾏ�ﾏ� ﾏ�ﾎｷﾎｽ ﾏ�ﾎｱﾏ∃ｬﾎｸﾎｵﾏπｷ';
 $labels['insertsignature'] = 'ﾎ�ﾏ∃ｿﾏπｸﾎｮﾎｺﾎｷ ﾏ�ﾏ�ﾎｿﾎｳﾏ∃ｱﾏ�ﾎｮﾏ�';
 $labels['previewpanemarkread']  = 'ﾎ｣ﾏ�ﾎｱ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｱ ﾏ�ﾎｿﾏ� ﾎｭﾎｳﾎｹﾎｽﾎｵ ﾏ�ﾏ∃ｿﾎｵﾏ�ﾎｹﾏπｺﾏ狐�ﾎｷﾏπｷ ﾎｽﾎｱ ﾎｼﾎｱﾏ∃ｺﾎｬﾏ∃ｿﾎｽﾏ�ﾎｱﾎｹ ﾏπｱﾎｽ ﾎｱﾎｽﾎｱﾎｳﾎｽﾏ珂πｼﾎｭﾎｽﾎｱ';
 $labels['afternseconds']  = 'ﾎｼﾎｵﾏ�ﾎｬ ﾎｱﾏ�ﾏ� $n ﾎｴﾎｵﾏ�ﾏ�ﾎｵﾏ�ﾏ湖ｻﾎｵﾏ�ﾏ�ﾎｱ';
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 542066efa..dc2499d8b 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾎ｣ﾏ�ﾎｬﾎｻﾎｼﾎｱ ﾎｲﾎｬﾏπｷﾏ� ﾎｴﾎｵﾎｴﾎｿﾎｼﾎｭﾎｽﾏ火ｽ!';
 $messages['requesttimedout'] = 'ﾎ､ﾎｿ ﾎｱﾎｯﾏ�ﾎｷﾎｼﾎｱ ﾎｵﾎｾﾎｭﾏ�ﾎｽﾎｵﾏ�ﾏπｵ ﾏ�ﾏ∃ｿﾎｽﾎｹﾎｺﾎｬ';
 $messages['errorreadonly'] = 'ﾎ� ﾎｴﾎｹﾎｱﾎｴﾎｹﾎｺﾎｱﾏπｯﾎｱ ﾎｴﾎｵﾎｽ ﾎｼﾏ�ﾎｿﾏ∃ｵﾎｯ ﾎｽﾎｱ ﾎｿﾎｻﾎｿﾎｺﾎｻﾎｷﾏ�ﾏ火ｸﾎｵﾎｯ. ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｼﾏ湖ｽﾎｿ ﾎｳﾎｹﾎｱ ﾎｱﾎｽﾎｬﾎｳﾎｽﾏ珂πｷ.';
 $messages['errornoperm'] = 'ﾎ� ﾎｴﾎｹﾎｱﾎｴﾎｹﾎｺﾎｱﾏπｯﾎｱ ﾎｴﾎｵﾎｽ ﾎｼﾏ�ﾎｿﾏ∃ｵﾎｯ ﾎｽﾎｱ ﾎｿﾎｻﾎｿﾎｺﾎｻﾎｷﾏ�ﾏ火ｸﾎｵﾎｯ. ﾎ�ﾏ∃ｽﾎｷﾏπｷ ﾎｬﾎｴﾎｵﾎｹﾎｱﾏ�';
+$messages['erroroverquota'] = 'ﾎ釆ｵﾎｽ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｴﾏ�ﾎｽﾎｱﾏ�ﾎｮ ﾎｷ ﾎｵﾎｺﾏ�ﾎｭﾎｻﾎｵﾏπｷ ﾏ�ﾎｷﾏ� ﾎｻﾎｵﾎｹﾏ�ﾎｿﾏ�ﾏ∃ｳﾎｯﾎｱﾏ�. ﾎ釆ｵﾎｽ ﾏ�ﾏ�ﾎｬﾏ�ﾏ�ﾎｵﾎｹ ﾎｵﾎｻﾎｵﾏ歳ｸﾎｵﾏ∃ｿﾏ� ﾏ�ﾏ煮∃ｿﾏ� ﾏρ�ﾎｿ ﾎｴﾎｯﾏπｺﾎｿ. ';
+$messages['erroroverquotadelete'] = 'ﾎ釆ｵﾎｽ ﾏ�ﾏ�ﾎｬﾏ�ﾏ�ﾎｵﾎｹ ﾎｵﾎｻﾎｵﾏ歳ｸﾎｵﾏ∃ｿﾏ� ﾏ�ﾏ煮∃ｿﾏ� ﾏρ�ﾎｿ ﾎｴﾎｯﾏπｺﾎｿ. ﾎｧﾏ∃ｷﾏπｹﾎｼﾎｿﾏ�ﾎｿﾎｹﾎｮﾏρ�ﾎｵ ﾏ�ﾎｿ ﾏρ�ﾎｽﾎｴﾏ�ﾎｱﾏπｼﾏ� ﾏ�ﾎｻﾎｮﾎｺﾏ�ﾏ�ﾏ火ｽ SHIFT DEL ﾎｳﾎｹﾎｱ ﾎｽﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ夷ｵﾏ�ﾎｵ ﾎｭﾎｽﾎｱ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ.';
 $messages['invalidrequest'] = 'ﾎ嶄ｱﾎｽﾎｸﾎｱﾏπｼﾎｭﾎｽﾎｿ ﾎｱﾎｯﾏ�ﾎｷﾎｼﾎｱ! ﾎ釆ｵﾎｽ ﾎｱﾏ�ﾎｿﾎｸﾎｷﾎｺﾎｵﾏ済�ﾎｷﾎｺﾎｱﾎｽ ﾎｴﾎｵﾎｴﾎｿﾎｼﾎｭﾎｽﾎｱ.';
 $messages['invalidhost'] = 'ﾎ�ﾎｺﾏ�ﾏ∃ｿ ﾏ湖ｽﾎｿﾎｼﾎｱ ﾎｵﾎｾﾏ�ﾏ�ﾎｷﾏ∃ｵﾏ�ﾎｷﾏ�ﾎｮ.';
 $messages['nomessagesfound'] = 'ﾎ釆ｵ ﾎｲﾏ∃ｭﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｼﾎｷﾎｽﾏ歳ｼﾎｱﾏ�ﾎｱ ﾏπｵ ﾎｱﾏ�ﾏ�ﾎｮ ﾏ�ﾎｷ ﾎｸﾏ�ﾏ∃ｯﾎｴﾎｱ';
@@ -90,8 +92,8 @@ $messages['searching'] = 'ﾎ対ｽﾎｱﾎｶﾎｮﾏ�ﾎｷﾏπｷ...';
 $messages['checking'] = 'ﾎ夷ｻﾎｵﾎｳﾏ�ﾎｿﾏ�...';
 $messages['nospellerrors'] = 'ﾎ釆ｵ ﾎｲﾏ∃ｭﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｿﾏ∃ｸﾎｿﾎｳﾏ∃ｱﾏ�ﾎｹﾎｺﾎｬ ﾎｻﾎｬﾎｸﾎｷ';
 $messages['folderdeleted'] = 'ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ�ﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['foldersubscribed'] = 'ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾎｵﾏ�ﾎｵﾎｹ ﾎｵﾎｳﾎｳﾏ∃ｱﾏ�ﾎｵﾎｯ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
+$messages['folderunsubscribed'] = 'ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ�ﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�';
 $messages['folderpurged'] = 'ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾎｺﾎｱﾎｸﾎｱﾏ∃ｯﾏρ�ﾎｷﾎｺﾎｵ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
 $messages['folderexpunged'] = 'ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾏρ�ﾎｼﾏ�ﾎｹﾎｭﾏρ�ﾎｷﾎｺﾎｵ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
 $messages['deletedsuccessfully'] = 'ﾎ釆ｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮ ﾎ変�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�';
@@ -119,9 +121,9 @@ $messages['selectimportfile'] = 'ﾎ変�ﾎｹﾎｻﾎｭﾎｾﾏ�ﾎｵ ﾎｱﾏ�ﾏ�ﾎｵﾎｯﾎｿ ﾎｳﾎｹﾎｱ ﾎｱﾎｽﾎｭﾎｲﾎｱ
 $messages['addresswriterror'] = 'ﾎ� ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｭﾎｽﾎｷ ﾎｱﾏ�ﾎｶﾎｭﾎｽﾏ�ﾎｱ ﾎｴﾎｹﾎｵﾏ�ﾎｸﾏ歳ｽﾏπｵﾏ火ｽ ﾎｴﾎｵﾎｽ ﾎｵﾎｯﾎｽﾎｱ ﾎｵﾎｳﾎｳﾏ∃ｬﾏ夷ｹﾎｼﾎｷ';
 $messages['contactaddedtogroup'] = 'ﾎ湮ｹ ﾎｵﾏ�ﾎｱﾏ�ﾎｭﾏ� ﾏ�ﾏ∃ｿﾏρ�ﾎｭﾎｸﾎｷﾎｺﾎｱﾎｽ ﾏρ�ﾎｷﾎｽ ﾎｿﾎｼﾎｬﾎｴﾎｱ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
 $messages['contactremovedfromgroup'] = 'ﾎ湮ｹ ﾎｵﾏ�ﾎｱﾏ�ﾎｭﾏ� ﾎｱﾏ�ﾎｱﾎｹﾏ∃ｭﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｱﾏ�ﾏ� ﾏ�ﾎｷﾎｽ ﾎｿﾎｼﾎｬﾎｴﾎｱ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'ﾎ湮ｹ ﾎｱﾎｽﾎｱﾎｸﾎｵﾏπｵﾎｹﾏ� ﾏ�ﾎｷﾏ� ﾎｿﾎｼﾎｱﾎｴﾎｱﾏ� ﾎｴﾎｵﾎｽ ﾎｱﾎｻﾎｻﾎｱﾎｾﾎｱﾎｽ.';
 $messages['importwait'] = 'ﾎ偏ｹﾏπｱﾎｳﾏ火ｳﾎｮ, ﾏ�ﾎｱﾏ∃ｱﾎｺﾎｱﾎｻﾏ� ﾏ�ﾎｵﾏ∃ｹﾎｼﾎｭﾎｽﾎｵﾏ�ﾎｵ...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = 'ﾎ� ﾎｵﾎｹﾏπｱﾎｳﾏ火ｳﾎｮ ﾎｱﾏ�ﾎｭﾏ�ﾏ�ﾏ�ﾎｵ! ﾎ､ﾎｿ ﾎｱﾏ�ﾏ�ﾎｵﾎｯﾎｿ ﾎｴﾎｵﾎｽ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｭﾎｳﾎｺﾏ�ﾏ∃ｿ ﾎｵﾎｹﾏπｱﾎｳﾏ火ｳﾎｮﾏ� ﾎｴﾎｵﾎｴﾎｿﾎｼﾎｭﾎｽﾏ火ｽ.';
 $messages['importconfirm'] = '<b>ﾎ偏ｹﾏπｮﾏ�ﾎｸﾎｷﾏπｱﾎｽ $inserted ﾎｵﾏ�ﾎｱﾏ�ﾎｭﾏ� ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ</b>';
 $messages['importconfirmskipped'] = '<b>ﾎ�ﾎｱﾏ∃ｱﾎｻﾎｮﾏ�ﾎｸﾎｷﾎｺﾎｱﾎｽ $skipped ﾏ�ﾏ�ﾎｬﾏ�ﾏ�ﾎｿﾎｽﾏ�ﾎｱ ﾎｱﾎｽﾏ�ﾎｹﾎｺﾎｵﾎｯﾎｼﾎｵﾎｽﾎｱ</b>';
 $messages['opnotpermitted'] = 'ﾎ� ﾎｻﾎｵﾎｹﾏ�ﾎｿﾏ�ﾏ∃ｳﾎｯﾎｱ ﾎｴﾎｵﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ∃ｭﾏ�ﾎｵﾏ�ﾎｱﾎｹ!';
@@ -140,30 +142,30 @@ $messages['maxgroupmembersreached'] = 'ﾎ� ﾎｱﾏ∃ｹﾎｸﾎｼﾏ狐� ﾏ�ﾏ火ｽ ﾎｼﾎｵﾎｻﾏ斜ｽ ﾏ�ﾎｷﾏ
 $messages['internalerror'] = 'ﾎ�ﾏ∃ｿﾎｭﾎｺﾏ�ﾏ夷ｵ ﾎｭﾎｽﾎｱ ﾎｵﾏρ珂�ﾎｵﾏ∃ｹﾎｺﾏ� ﾏρ�ﾎｬﾎｻﾎｼﾎｱ. ﾎ�ﾎｱﾏ∃ｱﾎｺﾎｱﾎｻﾏ� ﾎｴﾎｿﾎｺﾎｹﾎｼﾎｬﾏρ�ﾎｵ ﾏ�ﾎｬﾎｻﾎｹ.';
 $messages['contactdelerror'] = 'ﾎ釆ｵﾎｽ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｴﾏ�ﾎｽﾎｱﾏ�ﾎｮ ﾎｷ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮ ﾏ�ﾎｷﾏ� ﾎｵﾏ�ﾎｱﾏ�ﾎｮﾏ�/ﾏ火ｽ';
 $messages['contactdeleted'] = 'ﾎ� ﾎｵﾏ�ﾎｱﾏ�ﾎｮ/ﾎｭﾏ� ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ�ﾎｷﾎｺﾎｱﾎｽ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['contactrestoreerror'] = 'ﾎ湮ｹ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｷﾎｼﾎｵﾎｽﾎｷ ﾎｵﾏ�ﾎｱﾏ�ﾎｷ(ﾎｵﾏ�) ﾎｴﾎｵﾎｽ ﾎｼﾏ�ﾎｿﾏ∃ｿﾏ�ﾎｽ ﾎｽﾎｱ ﾎｵﾏ�ﾎｱﾎｽﾎｱﾏ�ﾎｵﾏ∃ｸﾎｿﾏ�ﾎｽ.';
+$messages['contactrestored'] = 'ﾎ� ﾎｵﾏ�ﾎｱﾏ�ﾎｷ(ﾎｵﾏ�) ﾎｵﾏ�ﾎｱﾎｽﾎｱﾏ�ﾎｵﾏ∃ｸﾎｷﾎｺﾎｱﾎｽ.';
+$messages['groupdeleted'] = 'ﾎ� ﾎｿﾎｼﾎｱﾎｴﾎｱ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ�ﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�.';
+$messages['grouprenamed'] = 'ﾎ� ﾎｿﾎｼﾎｱﾎｴﾎｱ ﾎｼﾎｵﾏ�ﾎｿﾎｽﾎｿﾎｼﾎｱﾏρ�ﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['groupcreated'] = 'ﾎ� ﾎｿﾎｼﾎｱﾎｴﾎｱ ﾎｴﾎｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｷﾎｸﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['savedsearchdeleted'] = 'ﾎ� ﾎｱﾏ�ﾎｿﾎｸﾎｷﾎｺﾎｵﾏ�ﾎｼﾎｭﾎｽﾎｷ ﾎｱﾎｽﾎｱﾎｶﾎｮﾏ�ﾎｷﾏπｷ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｬﾏ�ﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�. ';
+$messages['savedsearchdeleteerror'] = 'ﾎ釆ｵﾎｽ ﾎｮﾏ�ﾎｱﾎｽ ﾎｴﾏ�ﾎｽﾎｱﾏ�ﾎｮ ﾎｷ ﾎｴﾎｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｮ ﾏ�ﾎｷﾏ� ﾎｱﾏ�ﾎｿﾎｸﾎｷﾎｺﾎｵﾏ�ﾎｼﾎｭﾎｽﾎｷﾏ� ﾎｱﾎｽﾎｱﾎｶﾎｮﾏ�ﾎｷﾏπｷﾏ�.';
+$messages['savedsearchcreated'] = 'ﾎ� ﾎｱﾏ�ﾎｿﾎｸﾎｷﾎｺﾎｵﾏ�ﾎｼﾎｭﾎｽﾎｷ ﾎｱﾎｽﾎｱﾎｶﾎｷﾏ�ﾎｮﾏπｷ ﾎｴﾎｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｮﾎｸﾎｷﾎｺﾎｵ ﾎｼﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾎｯﾎｱ. ';
+$messages['savedsearchcreateerror'] = 'ﾎ� ﾎｱﾏ�ﾎｿﾎｸﾎｷﾎｺﾎｵﾏ�ﾎｼﾎｵﾎｽﾎｷ ﾎｱﾎｽﾎｱﾎｶﾎｷﾏ�ﾎｷﾏπｷ ﾎｴﾎｵﾎｽ ﾎｼﾏ�ﾎｿﾏ∃ｵﾏπｵ ﾎｽﾎｱ ﾎｴﾎｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｷﾎｸﾎｵﾎｹ.';
+$messages['messagedeleted'] = 'ﾎ､ﾎｿ ﾎｼﾏ�ﾎｽﾎｷﾎｼﾎｱ(ﾏ�ﾎｱ) ﾎｴﾎｹﾎｱﾎｳﾏ∃ｱﾏ�ﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['messagemoved'] = 'ﾎ､ﾎｿ ﾎｼﾏ�ﾎｽﾎｷﾎｼﾎｱ(ﾏ�ﾎｱ) ﾎｼﾎｵﾏ�ﾎｱﾎｺﾎｹﾎｽﾎｷﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['messagecopied'] = 'ﾎ､ﾎｿ ﾎｼﾏ�ﾎｽﾎｷﾎｼﾎｱ(ﾏ�ﾎｱ) ﾎｱﾎｽﾏ�ﾎｹﾎｳﾏ∃ｱﾏ�ﾎｸﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['messagemarked'] = 'ﾎ､ﾎｿ ﾎｼﾏ�ﾎｽﾎｷﾎｼﾎｱ(ﾏ�ﾎｱ) ﾎｼﾎｱﾏ∃ｺﾎｱﾏ∃ｹﾏπｸﾎｷﾎｺﾎｱﾎｽ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ珂�.';
+$messages['autocompletechars'] = 'ﾎ偏ｹﾏπｬﾎｳﾎｵﾏ�ﾎｵ ﾏ�ﾎｿﾏ�ﾎｻﾎｬﾏ�ﾎｹﾏρ�ﾎｿﾎｽ $min ﾏ�ﾎｱﾏ∃ｱﾎｺﾏ�ﾎｮﾏ∃ｵﾏ� ﾎｳﾎｹﾎｱ ﾎｱﾏ�ﾏ�ﾏ湖ｼﾎｱﾏ�ﾎｷ ﾏρ�ﾎｼﾏ�ﾎｻﾎｮﾏ�ﾏ珂πｷ.';
+$messages['autocompletemore'] = 'ﾎ�ﾎｵﾏ∃ｹﾏρρ狐�ﾎｵﾏ∃ｵﾏ� ﾏ�ﾎｱﾎｹﾏ∃ｹﾎｬﾏρ�ﾎｵﾏ� ﾎｺﾎｱﾏ�ﾎｱﾏ�ﾏ珂∃ｮﾏπｵﾎｹﾏ� ﾎｲﾏ∃ｭﾎｸﾎｷﾎｺﾎｱﾎｽ. ﾎ�ﾎｻﾎｷﾎｺﾏ�ﾏ∃ｿﾎｻﾎｿﾎｳﾎｵﾎｯﾏρ�ﾎｵ ﾏ�ﾎｵﾏ∃ｹﾏρρ狐�ﾎｵﾏ∃ｿﾏ�ﾏ� ﾏ�ﾎｱﾏ∃ｱﾎｺﾏ�ﾎｮﾏ∃ｵﾏ�.';
+$messages['namecannotbeempty'] = 'ﾎ､ﾎｿ ﾎｿﾎｽﾎｿﾎｼﾎｱ ﾎｴﾎｵﾎｽ ﾎｼﾏ�ﾎｿﾏ∃ｵﾎｯ ﾎｽﾎｱ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｺﾎｵﾎｽﾏ�.';
+$messages['nametoolong'] = 'ﾎ､ﾎｿ ﾏ湖ｽﾎｿﾎｼﾎｱ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾏ�ﾎｿﾎｻﾏ� ﾎｼﾎｵﾎｳﾎｬﾎｻﾎｿ.';
+$messages['folderupdated'] = 'ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾎｱﾎｽﾎｱﾎｽﾎｵﾏ火ｸﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�.';
+$messages['foldercreated'] = 'ﾎ� ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾎｴﾎｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｷﾎｸﾎｷﾎｺﾎｵ ﾎｵﾏ�ﾎｹﾏ�ﾏ�ﾏ�ﾏ煮�.';
+$messages['invalidimageformat'] = 'ﾎ慚ｷ ﾎｭﾎｳﾎｺﾏ�ﾏ∃ｷ ﾎｼﾎｿﾏ�ﾏ�ﾎｮ ﾎｵﾎｹﾎｺﾏ湖ｽﾎｱﾏ�. ';
+$messages['mispellingsfound'] = 'ﾎ渮∃ｸﾎｿﾎｳﾏ∃ｱﾏ�ﾎｹﾎｺﾎｬ ﾎｻﾎｬﾎｸﾎｷ ﾎｵﾎｽﾏ�ﾎｿﾏ�ﾎｯﾏρ�ﾎｷﾎｺﾎｱﾎｽ ﾏρ�ﾎｿ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ. ';
+$messages['parentnotwritable'] = 'ﾎ釆ｵﾎｽ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾎｴﾏ�ﾎｽﾎｱﾏ�ﾎｮ ﾎｷ ﾎｴﾎｷﾎｼﾎｹﾎｿﾏ�ﾏ∃ｳﾎｯﾎｱ/ﾎｼﾎｵﾏ�ﾎｱﾎｺﾎｹﾎｽﾎｮﾏπｷ ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿﾏ� ﾏπｵ ﾎｵﾏ�ﾎｹﾎｻﾎｵﾎｳﾎｼﾎｭﾎｽﾎｿ ﾏ�ﾎｬﾎｺﾎｵﾎｻﾎｿ ﾎｳﾎｿﾎｽﾎｭﾎｱ. ﾎ墅ｱﾎｽﾎｭﾎｽﾎｱ ﾎｴﾎｹﾎｺﾎｱﾎｯﾏ火ｼﾎｱ ﾏ�ﾏ�ﾏ狐πｲﾎｱﾏπｷﾏ�. ';
+$messages['messagetoobig'] = 'ﾎ､ﾎｿ ﾏ�ﾎｼﾎｮﾎｼﾎｱ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱﾏ�ﾎｿﾏ� ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾏ�ﾎｿﾎｻﾏ� ﾎｼﾎｵﾎｳﾎｬﾎｻﾎｿ ﾎｳﾎｹﾎｱ ﾎｵﾏ�ﾎｵﾎｾﾎｵﾏ∃ｳﾎｱﾏπｹﾎｱ. ';
+$messages['attachmentvalidationerror'] = 'ﾎ�ﾎ｡ﾎ湮偏厥釆湮�ﾎ湮莞緑｣ﾎ�! ﾎ耐�ﾏ�ﾎｮ ﾎｷ ﾎｺﾎｱﾏ�ﾎｬﾏρ�ﾎｵﾏπｷ ﾎｵﾎｯﾎｽﾎｱﾎｹ ﾏ済�ﾎｿﾏ�ﾏ�ﾎｷ, ﾎｵﾏ�ﾎｵﾎｹﾎｴﾎｮ ﾎｿ ﾏ�ﾏ済�ﾎｿﾏ� ﾎｴﾎｵﾎｽ ﾏ�ﾎｱﾎｹﾏ∃ｹﾎｬﾎｶﾎｵﾎｹ ﾎｼﾎｵ ﾏ�ﾎｿﾎｽ ﾏ�ﾏ済�ﾎｿ ﾏ�ﾎｿﾏ� ﾎｴﾎｷﾎｻﾏ斜ｽﾎｵﾏ�ﾎｱﾎｹ ﾏρ�ﾎｿ ﾎｼﾎｮﾎｽﾏ�ﾎｼﾎｱ. ﾎ偏ｬﾎｽ ﾎｴﾎｵﾎｽ ﾎｵﾎｼﾏ�ﾎｹﾏρ�ﾎｵﾏ歳ｵﾏρ�ﾎｵ ﾏ�ﾎｿﾎｽ ﾎｱﾏ�ﾎｿﾏρ�ﾎｿﾎｻﾎｭﾎｱ, ﾎｴﾎｵﾎｽ ﾎｸﾎｱ ﾏ�ﾏ∃ｭﾏ�ﾎｵﾎｹ ﾎｽﾎｱ ﾏ�ﾎｿ ﾎｱﾎｽﾎｿﾎｯﾎｳﾎｵﾏ�ﾎｵ ﾏρ�ﾎｿ ﾏ�ﾏ�ﾏ湖ｳﾏ∃ｱﾎｼﾎｼﾎｱ ﾏ�ﾎｵﾏ∃ｹﾎｮﾎｳﾎｷﾏπｷﾏ� ﾎｵﾏ�ﾎｵﾎｹﾎｴﾎｮ ﾎｼﾏ�ﾎｿﾏ∃ｵﾎｯ ﾎｽﾎｱ ﾏ�ﾎｵﾏ∃ｹﾎｭﾏ�ﾎｵﾎｹ ﾎｺﾎｱﾎｺﾏ湖ｲﾎｿﾏ�ﾎｻﾎｿ ﾏ�ﾎｵﾏ∃ｹﾎｵﾏ�ﾏ湖ｼﾎｵﾎｽﾎｿ.<br/><br/><em>Expected: $expected; found: $detected</em> ';
+$messages['noscriptwarning'] = 'ﾎ�ﾏ∃ｿﾎｵﾎｹﾎｴﾎｿﾏ�ﾎｿﾎｯﾎｷﾏπｷ : ﾎ耐�ﾏ�ﾎｮ ﾎｷ ﾏ�ﾏ�ﾎｷﾏ∃ｵﾏπｯﾎｱ webmail ﾎｱﾏ�ﾎｱﾎｹﾏ�ﾎｵﾎｯ Javascript! ﾎ鳶ｹﾎｱ ﾎｽﾎｱ ﾎ､ﾎ� ﾏ�ﾏ∃ｷﾏπｹﾎｼﾎｿﾏ�ﾎｿﾎｹﾎｮﾏπｵﾏ�ﾎｵ ﾎｵﾎｽﾎｵﾏ∃ｳﾎｿﾏ�ﾎｿﾎｹﾎｮﾏρ�ﾎｵ ﾏ�ﾎ� JavaScript ﾏρ�ﾎｹﾏ� ﾏ�ﾏ�ﾎｸﾎｼﾎｯﾏπｵﾎｹﾏ� ﾏ�ﾎｿﾏ� browser ﾏπｱﾏ�. ';
 
 ?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index fb9ebe383..275208a98 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copy';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message only';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index f819147b0..21e7539b4 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 57d7c2e42..c088fc50e 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopii';
 $labels['move']     = 'Movi';
 $labels['moveto']   = 'transloku al...';
 $labels['download'] = 'elﾅ掎tu';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Nuna paﾄ捐';
 $labels['unread'] = 'Nelegitan';
 $labels['flagged'] = 'Markita';
 $labels['unanswered'] = 'Nerespondita';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Forigita';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inversigu';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elﾅ掎tu (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Redaktu kiel nova';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Uzado de HTML-redaktilo';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML subskribo';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Montru antaﾅｭrigardejon';
 $labels['skin'] = 'Interfaco-etoso';
 $labels['logoutclear'] = 'Malplenigu rubujon je eliro';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 32771733d..4d72fe54b 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Datumbaz-eraro!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Ne povis fari agon. Dosierujo estas nurlega';
 $messages['errornoperm'] = 'Ne povis fari agon. Ne havas permeson.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Nevalida peto';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Neniu mesaﾄ捐 en ﾄ永 tiu dosierujo';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index d6760ac97..d9a83be75 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Basura';
 // message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitente';
 $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Copia';
 $labels['bcc']     = 'Cco';
@@ -52,20 +52,21 @@ $labels['size']    = 'Tamaﾃｱo';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organizaciﾃｳn';
 $labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = 'Listar opciones...';
 
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['threadsfromto'] = '$from a $to de $count conversaciones';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
-$labels['fromtoshort'] = '$from 窶� $to of $count';
+$labels['fromtoshort'] = '$from 窶� $to de $count';
 
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Mostrar';
+$labels['showanyway'] = 'Mostrar esto siempre';
 
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaﾃｱo del archivo';
@@ -121,18 +122,18 @@ $labels['longdec']	= 'Diciembre';
 $labels['today'] = 'Hoy';
 
 // toolbar buttons
-$labels['refresh']          = 'Refresh';
+$labels['refresh']          = 'Actualizar';
 $labels['checkmail']        = 'Revisar si hay nuevos mensajes';
 $labels['compose']          = 'Escribir un mensaje';
 $labels['writenewmessage']  = 'Crear nuevo mensaje';
-$labels['reply']            = 'Reply';
+$labels['reply']            = 'Responder';
 $labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Responder a lista';
+$labels['forward']          = 'Reenviar';
+$labels['forwardinline']    = 'Reenviar en linea';
+$labels['forwardattachment'] = 'Reenviar como adjunto';
 $labels['forwardmessage']   = 'Reenviar mensaje';
 $labels['deletemessage']    = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
@@ -143,16 +144,16 @@ $labels['nextmessage']      = 'Mostrar siguente mensaje';
 $labels['lastmessage']      = 'Mostrar ﾃｺltimo mensaje';
 $labels['backtolist']       = 'Volver a la lista de mensajes';
 $labels['viewsource']       = 'Mostrar cﾃｳdigo';
-$labels['mark']             = 'Mark';
+$labels['mark']             = 'Marcar';
 $labels['markmessages']     = 'Marcar mensajes';
 $labels['markread']         = 'Como leﾃｭdo';
 $labels['markunread']       = 'Como no leﾃｭdo';
 $labels['markflagged']      = 'Como marcado';
 $labels['markunflagged']    = 'Como no marcado';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
+$labels['moreactions']      = 'Mas acciones...';
+$labels['more']             = 'Mﾃ｡s';
+$labels['back']             = 'Atrﾃ｡s';
+$labels['options']          = 'Opciones';
 
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
@@ -161,34 +162,35 @@ $labels['currpage'] = 'Pﾃ｡gina actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
 $labels['unanswered'] = 'Sin respuesta';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eliminado';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Conversaciones';
 $labels['expand-all'] = 'Expandir Todos';
 $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
-$labels['threaded'] = 'Threaded';
+$labels['threaded'] = 'Como conversaciones';
 
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
+$labels['autoexpand_threads'] = 'Expandir mensajes en conversaciﾃｳn';
+$labels['do_expand'] = 'todas las conversaciones';
 $labels['expand_only_unread'] = 'solo con mensajes no leﾃｭdos';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
+$labels['fromto'] = 'De/A';
+$labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunto';
 $labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de Enviado';
 $labels['arrival'] = 'Fecha de Recepciﾃｳn';
 $labels['asc'] = 'Ascendente';
 $labels['desc'] = 'Descendente';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
+$labels['listcolumns'] = 'Listar columnas';
+$labels['listsorting'] = 'Ordenar por';
+$labels['listorder'] = 'Ordenado por';
 $labels['listmode'] = 'List view mode';
 
-$labels['folderactions'] = 'Folder actions...';
+$labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
 
@@ -204,32 +206,34 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
-$labels['send']           = 'Send';
+$labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar ahora el mensaje';
 $labels['savemessage']    = 'Guardar como borrador';
 $labels['addattachment']  = 'Aﾃｱadir un archivo';
 $labels['charset']        = 'Codificaciﾃｳn';
 $labels['editortype']     = 'Tipo de editor';
 $labels['returnreceipt']  = 'Acuse de recibo';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
+$labels['dsn']            = 'Notificaciﾃｳn de estado del envﾃｭo';
+$labels['mailreplyintro'] = 'El $date, $sender escribiﾃｳ:';
+$labels['originalmessage'] = 'Mensaje original';
 
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Gramﾃ｡tica';
 $labels['checkspelling'] = 'Revisar ortografﾃｭa';
 $labels['resumeediting'] = 'Continuar ediciﾃｳn';
 $labels['revertto']      = 'Revertir a';
 
-$labels['attach'] = 'Attach';
+$labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Agregar';
-$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Cerrar';
-$labels['messageoptions']  = 'Message options...';
+$labels['messageoptions']  = 'Opciones de mensaje...';
 
 $labels['low']     = 'Bajo';
 $labels['lowest']  = 'Bajﾃｭsimo';
@@ -240,9 +244,9 @@ $labels['highest'] = 'Altﾃｭsimo';
 $labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imﾃ｡genes';
 $labels['alwaysshow'] = 'Siempre mostrar imﾃ｡genes de $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['isdraft']    = 'Este es un borrador.';
+$labels['andnmore']   = '$nr mﾃ｡s...';
+$labels['togglemoreheaders'] = 'Mostrarme mﾃ｡s encabezados de mensaje';
 $labels['togglefullheaders'] = 'Toggle raw message headers';
 
 $labels['htmltoggle'] = 'HTML';
@@ -266,68 +270,68 @@ $labels['receiptnote'] = 'Nota: Esta notificaciﾃｳn sﾃｳlo significa que su mensaj
 $labels['name']         = 'Nombre completo';
 $labels['firstname']    = 'Nombre';
 $labels['surname']      = 'Apellido';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
+$labels['middlename']   = 'Segundo nombre';
+$labels['nameprefix']   = 'Prefijo';
+$labels['namesuffix']   = 'Subfijo';
+$labels['nickname']     = 'Sobre nombre';
+$labels['jobtitle']     = 'Puesto';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
+$labels['maidenname']   = 'Apellido de soltera';
 $labels['email']        = 'Correo';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
+$labels['phone']        = 'Telﾃｩfono';
+$labels['address']      = 'Direcciﾃｳn';
+$labels['street']       = 'Calle';
+$labels['locality']     = 'Ciudad';
+$labels['zipcode']      = 'Cﾃｳdigo Postal';
+$labels['region']       = 'Estado/Provincia';
+$labels['country']      = 'Paﾃｭs';
+$labels['birthday']     = 'Cumpleaﾃｱos';
+$labels['anniversary']  = 'Aniversario';
+$labels['website']      = 'Sitio Web';
+$labels['instantmessenger'] = 'Mensajerﾃｭa Instantanea';
+$labels['notes'] = 'Notas';
+$labels['male']   = 'masculino';
+$labels['female'] = 'femenino';
+$labels['manager'] = 'Administrador';
+$labels['assistant'] = 'Asistente';
+$labels['spouse'] = 'Cﾃｳnygue';
+$labels['allfields'] = 'Todos los campos';
+$labels['search'] = 'Buscar';
+$labels['advsearch'] = 'Bﾃｺsqueda Avanzada';
+$labels['advanced'] = 'Avanzado';
+$labels['other'] = 'Otro';
+
+$labels['typehome']   = 'Particular';
+$labels['typework']   = 'Laboral';
+$labels['typeother']  = 'Otro';
+$labels['typemobile']  = 'Mﾃｳvil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax Particular';
+$labels['typeworkfax']  = 'Fax Laboral';
+$labels['typecar']  = 'Auto';
 $labels['typepager']  = 'Pager';
 $labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
+$labels['typeassistant']  = 'Asistente';
+$labels['typehomepage']  = 'Pﾃ｡gina Personal';
 $labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
+$labels['typeprofile'] = 'Perfil';
 
-$labels['addfield'] = 'Add field...';
+$labels['addfield'] = 'Agregar campo...';
 $labels['addcontact'] = 'Aﾃｱadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
+$labels['contacts'] = 'Contactos';
+$labels['contactproperties'] = 'Propiedades del contacto';
+$labels['personalinfo'] = 'Informaciﾃｳn personal';
 
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
+$labels['rename'] = 'Renombrar';
+$labels['addphoto'] = 'Agregar';
+$labels['replacephoto'] = 'Reemplazar';
+$labels['uploadphoto'] = 'Subir foto';
 
 $labels['newcontact']     = 'Aﾃｱadir nuevo contacto';
 $labels['deletecontact']  = 'Eliminar contactos seleccionados';
@@ -339,9 +343,9 @@ $labels['exportall']      = 'Export all';
 $labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
+$labels['grouprename']    = 'Renombrar grupo';
+$labels['groupdelete']    = 'Eliminar grupo';
+$labels['groupremoveselected'] = 'Remover del grupo los contactos seleccionados';
 
 $labels['previouspage']   = 'Mostrar grupo anterior';
 $labels['firstpage']      = 'Mostrar primer grupo';
@@ -352,20 +356,20 @@ $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
 
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
+$labels['searchsave'] = 'Guardar bﾃｺsqueda';
+$labels['searchdelete'] = 'Eliminar bﾃｺsqueda';
 
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
-$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importtarget'] = 'Agregar nuevos contactos a la libreta de direcciones:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Puedes subir contactos desde una libreta de direcciones existente.<br/>Actualmente soportamos la importaciﾃｳn de direcciones utilizando el formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (Valores Separados por Coma).';
 $labels['done'] = 'Hecho';
 
 // settings
 $labels['settingsfor'] = 'Configuraciﾃｳn para';
-$labels['about'] = 'About';
+$labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
@@ -382,8 +386,8 @@ $labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
 $labels['htmlmessage'] = 'Mensaje HTML';
 $labels['messagepart'] = 'Part';
 $labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
+$labels['dateformat'] = 'Formato de fecha';
+$labels['timeformat'] = 'Formato de tiempo';
 $labels['prettydate'] = 'Fecha detallada';
 $labels['setdefault']  = 'Seleccionar opciﾃｳn por defecto';
 $labels['autodetect']  = 'Automﾃ｡tico';
@@ -392,12 +396,13 @@ $labels['timezone']  = 'Zona horaria';
 $labels['pagesize']  = 'Filas por pﾃ｡gina';
 $labels['signature'] = 'Firma';
 $labels['dstactive']  = 'Cambio de horario';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['showinextwin'] = 'Abrir mensaje en nueva ventana';
+$labels['composeextwin'] = 'Redactar en nueva ventana';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreply'] = 'al responder un mensaje HTML';
+$labels['htmlonreplyandforward'] = 'al reenviar o responder un mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesiﾃｳn';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje o
 $labels['autoaddsignature'] = 'Agregar la firma automﾃ｡ticamente';
 $labels['newmessageonly'] = 'nuevos mensajes solamente';
 $labels['replyandforwardonly'] = 'respuestas o reenvios solamente';
-$labels['replysignaturepos'] = 'Agregar firma al responder o reenviar';
-$labels['belowquote'] = 'debajo de la cita';
-$labels['abovequote'] = 'sobre la cita';
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensajes previsualizados como leidos';
 $labels['afternseconds']  = 'despues de $n segundos';
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 167fbe290..1cec9f01d 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Error en base de datos!';
 $messages['requesttimedout'] = 'Tiempo de espera agotado';
 $messages['errorreadonly'] = 'No se pudo realizar la operaciﾃｳn. La carpeta es de sﾃｳlo lectura.';
 $messages['errornoperm'] = 'No se pudo realizar la operaciﾃｳn. Permiso denegado.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Peteciﾃｳn invalida! No se guardﾃｳ nada.';
 $messages['invalidhost'] = 'Nombre de servidor invﾃ｡lido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index eca1d1e93..03f6b489a 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a窶ｦ';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrarlo de todos modos';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pﾃ｡gina actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Seﾃｱalado';
 $labels['unanswered'] = 'Sin respuesta';
+$labels['withattachment'] = 'Con adjunto';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
@@ -204,6 +206,8 @@ $labels['body']  = 'Cuerpo';
 
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
+$labels['changeformattext'] = 'Mostrar en formato de texto sencillo';
+$labels['changeformathtml'] = 'Mostrar en formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Componer mensaje en HTML';
 $labels['htmlonreply'] = 'sﾃｳlo en respuesta a un mensaje HTML';
 $labels['htmlonreplyandforward'] = 'en reenvﾃｭo o respuesta al mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesiﾃｳn';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Eliminar la firma original del mensaje al res
 $labels['autoaddsignature'] = 'Aﾃｱadir firma automﾃ｡ticamente';
 $labels['newmessageonly'] = 'solamente mensaje nuevo';
 $labels['replyandforwardonly'] = 'respuestas y reenvﾃｭos solamente';
-$labels['replysignaturepos'] = 'Colocar firma al responder o reenviar';
-$labels['belowquote'] = 'abajo del texto seleccionado';
-$labels['abovequote'] = 'arriba del texto seleccionado';
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensaje previsualizado como leﾃｭdo';
 $labels['afternseconds']  = 'despuﾃｩs de $n segundos';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 45552200c..6c031df29 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾂ｡Error de base de datos!';
 $messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
 $messages['errorreadonly'] = 'Imposible realizar la operaciﾃｳn. La bandeja es sﾃｳlo de lectura.';
 $messages['errornoperm'] = 'Imposible realizar la operaciﾃｳn. Permiso denegado.';
+$messages['erroroverquota'] = 'No se pudo completar la operaciﾃｳn. No queda espacio en el disco.';
+$messages['erroroverquotadelete'] = 'No queda espacio en el disco. Use Shift+Supr para borrar un mensaje.';
 $messages['invalidrequest'] = 'ﾂ｡Peticiﾃｳn no vﾃ｡lida! No se han guardado los datos.';
 $messages['invalidhost'] = 'Nombre de servidor invﾃ｡lido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla.';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 01c372308..c3b3aa954 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopeeri';
 $labels['move']     = 'Liiguta';
 $labels['moveto']   = 'liiguta kausta...';
 $labels['download'] = 'laadi arvutisse';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Nﾃ､ita';
 $labels['showanyway'] = 'Nﾃ､ita ikka';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Praegune leht';
 $labels['unread'] = 'Lugemata';
 $labels['flagged'] = 'Mﾃ､rgistatud';
 $labels['unanswered'] = 'Vastamata';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Kustutatud';
 $labels['undeleted'] = 'Pole kustutatud';
 $labels['invert'] = 'Vaheta';
@@ -204,6 +206,8 @@ $labels['body']  = 'Keha';
 
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Kasuta uue kirja pﾃｵhjana';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Kasuta HTML redaktorit';
 $labels['htmlonreply'] = 'vaid HTML-vormingus kirjale vastamisel';
 $labels['htmlonreplyandforward'] = 'edastamisel vﾃｵi HTML kirjale vastates';
 $labels['htmlsignature'] = 'HTML allkiri';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Nﾃ､ita eelvaate akent';
 $labels['skin'] = 'Kliendi vﾃ､limus';
 $labels['logoutclear'] = 'Tﾃｼhjenda vﾃ､ljumisel prﾃｼgikast';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Vastates eemalda kirjast esialgne allkiri';
 $labels['autoaddsignature'] = 'Lisa allkiri automaatselt';
 $labels['newmessageonly'] = 'ainult uutele';
 $labels['replyandforwardonly'] = 'ainult vastates ja edastades';
-$labels['replysignaturepos'] = 'Vastates vﾃｵi edastades aseta allkiri';
-$labels['belowquote'] = 'tsiteeritu alla';
-$labels['abovequote'] = 'tsiteeritu kohale';
 $labels['insertsignature'] = 'Sisesta allkiri';
 $labels['previewpanemarkread']  = 'Mﾃ､rgi eelvaadatud kirjad loetuks';
 $labels['afternseconds']  = '$n sekundi pﾃ､rast';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 653b48be5..0064eaf9d 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Andmebaasi tﾃｵrge!';
 $messages['requesttimedout'] = 'Pﾃ､ring aegus';
 $messages['errorreadonly'] = 'Operatsioon nurjus. Kaustale on vaid lugemisﾃｵigus';
 $messages['errornoperm'] = 'Operatsioon nurjus. Ligipﾃ､ﾃ､su ﾃｵigused puuduvad';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Lubamatu pﾃ､ring! Andmeid ei salvestatud.';
 $messages['invalidhost'] = 'Lubamatu serveri nimi.';
 $messages['nomessagesfound'] = 'Postkast paistab tﾃｼhi olevat';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 6b45038f8..8052d69e8 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopia';
 $labels['move']     = 'Mugitu';
 $labels['moveto']   = 'mugitu hona...';
 $labels['download'] = 'deskargatu';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Uneko orrialdea';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['flagged'] = 'Banderaduna';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ezabatuak';
 $labels['undeleted'] = 'Ezabatu gabeak';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Lehio berrian ireki';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML mezuak sortu';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML sinadura';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Aurrebista panela ikusi';
 $labels['skin'] = 'Azal-interfazea';
 $labels['logoutclear'] = 'Garbitu Zakarronzia irtetean';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 118f53ff6..a3985b233 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Ez da mezurik aurkitu posta kutxa honetan';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index ae38105db..70113bc49 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾘｪﾚｩﾘｫﾛ鈷ｱ';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ﾘｧﾙ�ﾘｪﾙぺｧﾙ� ﾘｨﾘｯﾙ�ﾛ鈷ｯ ﾘｨﾙ� ...';
 $labels['download'] = 'ﾘｯﾘｧﾙ異�ﾙ�ﾙ畏ｯ ﾚｩﾘｱﾘｯﾙ�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'ﾙ�ﾘｧﾘｮﾙ畏ｧﾙ�ﾘｯﾙ�';
 $labels['flagged'] = 'ﾙ�ﾘｴﾘｧﾙ�ﾛ� ﾘｴﾘｯﾙ�';
 $labels['unanswered'] = 'ﾙｾﾛ鈷ｧﾙ�ﾙ�ﾘｧﾛ� ﾘｬﾙ畏ｧﾘｨ ﾙ�ﾘｯﾘｧﾘｯﾙ� ﾘｴﾘｯﾙ�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'ﾘｯﾘｱ ﾙｾﾛ雇�ﾘｬﾘｱﾙ� ﾘｧﾛ� ﾘｬﾘｯﾛ鈷ｯ ﾘｨﾘｧﾘｲ ﾚｩﾙ�ﾛ鈷ｯ';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾙｾﾙ韓ｺﾘｧﾙ� ﾘｧﾙ舘� ﾙｼﾙ� ﾘｧﾙ� ﾘｧﾙ館� ﾘｱﾘｧﾙ�ﾙ畏ｴﾘｪﾙ� ﾚｩﾙ�ﾙ
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ﾘｧﾙ�ﾘｶﾘｧﾛ� ﾘｭﾘｳﾘｧﾘｨ ﾘｧﾛ雇�ﾛ雇� ﾘｨﾘｴﾚｩﾙ� ﾘｧﾛ顧� ﾘｪﾛ� ﾘｧﾙ� ﾘｧﾙ�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾚ�ﾙ移ｩﾘｧﾘｪ ﾙｾﾛ鈷ｴﾙ�ﾙ�ﾘｧ ﾘｱﾘｧ ﾙ�ﾘｴﾘｧﾙ� ﾘｯﾙ�ﾛ鈷ｯ';
 $labels['skin'] = 'ﾘｪﾙ�ﾙｾﾙ�ﾛ鈷ｪ ﾙ�ﾘｭﾛ鈷ｷ ﾚｩﾘｧﾘｱﾘｨﾘｱﾛ�';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index aa479b9c6..4f3d4be55 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ﾙ�ﾙ舘� ﾙｾﾙ韓ｺﾘｧﾙ�ﾛ� ﾘｯﾘｱ ﾘｧﾙ館� ﾘｵﾙ�ﾘｯﾙ異� ﾙｾﾘｳﾘｪﾙ� ﾘｯﾘｱﾙ韓ｧﾙ�ﾘｪ ﾙ�ﾙ� ﾘｴﾘｯ';
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index 518c6742b..221e4b891 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -20,9 +20,9 @@ $labels = array();
 
 // login page
 $labels['welcome']   = 'ﾘｨﾙ� $product ﾘｮﾙ畏ｴ ﾘ｢ﾙ�ﾘｯﾛ鈷ｯ';
-$labels['username']  = 'ﾙ�ﾘｧﾙ�窶顧ｩﾘｧﾘｱﾘｨﾘｱﾛ�';
+$labels['username']  = 'ﾙ�ﾘｧﾙ� ﾚｩﾘｧﾘｱﾘｨﾘｱﾛ�';
 $labels['password']  = 'ﾚｯﾘｰﾘｱﾙ畏ｧﾚ俛�';
-$labels['server']    = 'ﾘｳﾘｱﾙ畏ｱ';
+$labels['server']    = 'ﾘｳﾘｱﾙ維鈷ｳ窶鈷ｯﾙ�ﾙ�ﾘｯﾙ�';
 $labels['login']     = 'ﾙ畏ｱﾙ畏ｯ';
 
 // taskbar
@@ -34,8 +34,8 @@ $labels['addressbook'] = 'ﾘｯﾙ�ﾘｪﾘｱ ﾙ�ﾘｴﾘｧﾙ�ﾛ�';
 // mailbox names
 $labels['inbox']  = 'ﾘｵﾙ�ﾘｯﾙ異� ﾙ畏ｱﾙ畏ｯﾛ�';
 $labels['drafts'] = 'ﾙｾﾛ鈷ｴ窶雇�ﾙ維鈷ｳ窶雇�ﾘｧ';
-$labels['sent']   = 'ﾘｧﾘｱﾘｳﾘｧﾙ� ﾘｴﾘｯﾙ�';
-$labels['trash']  = 'ﾘｲﾘｨﾘｧﾙ�ﾙ�窶鈷ｯﾘｧﾙ�';
+$labels['sent']   = 'ﾙ�ﾘｱﾘｳﾘｪﾘｧﾘｯﾙ� ﾘｴﾘｯﾙ�';
+$labels['trash']  = 'ﾘｳﾘｷﾙ� ﾘ｢ﾘｴﾘｺﾘｧﾙ�';
 $labels['junk']   = 'ﾘｨﾙ�ﾘｬﾙ�';
 
 // message listing
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾘｱﾙ異�ﾙ畏ｴﾘｪ';
 $labels['move']     = 'ﾘｧﾙ�ﾘｪﾙぺｧﾙ�';
 $labels['moveto']   = 'ﾘｧﾙ�ﾘｪﾙぺｧﾙ� ﾘｨﾙ�...';
 $labels['download'] = 'ﾘｨﾘｧﾘｱﾚｯﾛ鈷ｱﾛ�';
+$labels['open']     = 'ﾘｨﾘｧﾘｲ ﾚｩﾘｱﾘｯﾙ�';
 $labels['showattachment'] = 'ﾙ�ﾙ�ﾘｧﾛ鈷ｴ';
 $labels['showanyway'] = 'ﾙ�ﾙ�ﾘｧﾛ鈷ｴ ﾘ｢ﾙ� ﾘｯﾘｱ ﾙ�ﾘｱ ﾘｵﾙ畏ｱﾘｪ';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾘｵﾙ�ﾘｭﾙ� ﾘｬﾘｧﾘｱﾛ�';
 $labels['unread'] = 'ﾘｮﾙ畏ｧﾙ�ﾘｯﾙ�窶雇�ﾘｴﾘｯﾙ�';
 $labels['flagged'] = 'ﾙｾﾘｱﾚ�ﾙ�窶鈷ｯﾘｧﾘｱ';
 $labels['unanswered'] = 'ﾙｾﾘｧﾘｳﾘｮ ﾘｯﾘｧﾘｯﾙ� ﾙ�ﾘｴﾘｯﾙ�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾘｭﾘｰﾙ� ﾘｴﾘｯﾙ�';
 $labels['undeleted'] = 'ﾘｭﾘｰﾙ� ﾙ�ﾘｴﾘｯﾙ�';
 $labels['invert'] = 'ﾙ畏ｧﾘｱﾙ異�ﾙ�';
@@ -204,6 +206,8 @@ $labels['body']  = 'ﾘｨﾘｯﾙ�ﾙ�';
 
 $labels['openinextwin'] = 'ﾘｨﾘｧﾘｲ ﾚｩﾘｱﾘｯﾙ� ﾘｯﾘｱ ﾙｾﾙ�ﾘｬﾘｱﾙ�窶鼓� ﾘｬﾘｯﾛ鈷ｯ';
 $labels['emlsave'] = 'ﾘｨﾘｧﾘｱﾚｯﾛ鈷ｱﾛ� (.eml)';
+$labels['changeformattext'] = 'ﾙ�ﾙ�ﾘｧﾛ鈷ｴ ﾘｯﾘｱ ﾙぺｧﾙ�ﾘｨ ﾙ�ﾘｪﾙ�ﾛ�';
+$labels['changeformathtml'] = 'ﾙ�ﾙ�ﾘｧﾛ鈷ｴ ﾘｯﾘｱ ﾙぺｧﾙ�ﾘｨ ﾘｧﾚ�窶鈷ｪﾛ娯�鈷ｧﾙ�窶鈷ｧﾙ�';
 
 // message compose
 $labels['editasnew']      = 'ﾙ維鈷ｱﾘｧﾛ鈷ｴ ﾘｨﾙ� ﾘｹﾙ�ﾙ畏ｧﾙ� ﾘｬﾘｯﾛ鈷ｯ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML 窶雇�ﾙ畏ｴﾘｪﾙ� ﾙｾﾛ鈷ｺﾘｧﾙ�窶雇�ﾘｧﾛ�';
 $labels['htmlonreply'] = 'ﾙ�ﾙぺｷ ﾘｯﾘｱ ﾙｾﾘｧﾘｳﾘｮ ﾘｨﾙ� ﾙｾﾛ鈷ｺﾘｧﾙ� HTML';
 $labels['htmlonreplyandforward'] = 'ﾘｯﾘｱ ﾘｨﾘｧﾘｲﾚｯﾘｱﾘｯﾘｧﾙ�ﾛ� ﾛ鈷ｧ ﾙｾﾘｧﾘｳﾘｮ ﾘｨﾙ� ﾙｾﾛ鈷ｺﾘｧﾙ�窶雇�ﾘｧﾛ� HTML';
 $labels['htmlsignature'] = 'HTML ﾘｧﾙ�ﾘｶﾘｧﾛ�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾙ�ﾙ�ﾘｧﾛ鈷ｴ ﾙぺｧﾘｨ ﾙｾﾛ鈷ｴ窶雇�ﾙ�ﾘｧﾛ鈷ｴ';
 $labels['skin'] = 'ﾙｾﾙ畏ｳﾘｪﾙ� ﾘｸﾘｧﾙ�ﾘｱﾛ�';
 $labels['logoutclear'] = 'ﾘｪﾙ�ﾛ鈷ｲ ﾚｩﾘｱﾘｯﾙ� ﾘｲﾘｨﾘｧﾙ�ﾙ� ﾘｯﾘｧﾙ� ﾙ�ﾙ�ﾚｯﾘｧﾙ� ﾘｨﾘｱﾙ異�窶鈷ｱﾙ�ﾘｪ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾙ�ﾙ�ﾚｯﾘｧﾙ� ﾙｾﾘｧﾘｳﾘｮ ﾘｧﾙ�ﾘｶﾘｧﾘ｡ ﾘｧﾘｵﾙ�ﾛ� ﾘｱﾘｧ
 $labels['autoaddsignature'] = 'ﾘｧﾘｶﾘｧﾙ�ﾙ� ﾚｩﾘｱﾘｯﾙ� ﾘｮﾙ畏ｯﾚｩﾘｧﾘｱ ﾘｧﾙ�ﾘｶﾘｧﾘ｡';
 $labels['newmessageonly'] = 'ﾙ�ﾙぺｷ ﾙｾﾛ鈷ｺﾘｧﾙ� ﾘｬﾘｯﾛ鈷ｯ';
 $labels['replyandforwardonly'] = 'ﾙ�ﾙぺｷ ﾙｾﾘｧﾘｳﾘｮ窶雇�ﾘｧ ﾙ� ﾘｧﾘｱﾘｬﾘｧﾘｹ窶雇�ﾘｧ';
-$labels['replysignaturepos'] = 'ﾙ�ﾙ�ﾚｯﾘｧﾙ� ﾙｾﾘｧﾘｳﾘｮ ﾛ鈷ｧ ﾘｧﾘｱﾘｬﾘｧﾘｹ ﾘｧﾙ�ﾘｶﾘｧﾘ｡ ﾘｱﾘｧ ﾙぺｱﾘｧﾘｱ ﾘｯﾘｧﾘｯﾙ� ﾘｴﾙ畏ｯ';
-$labels['belowquote'] = 'ﾘｲﾛ鈷ｱ ﾙ�ﾙほ�窶雇ほ異�';
-$labels['abovequote'] = 'ﾘｨﾘｧﾙ�ﾘｧﾛ� ﾙ�ﾙほ�窶雇ほ異�';
 $labels['insertsignature'] = 'ﾘｯﾘｱﾘｬ ﾘｧﾙ�ﾘｶﾘｧﾘ｡';
 $labels['previewpanemarkread']  = 'ﾙ�ﾘｴﾘｧﾙ�ﾙ�窶顧ｯﾘｰﾘｧﾘｱﾛ� ﾙｾﾛ鈷ｺﾘｧﾙ�窶雇�ﾘｧﾛ� ﾙｾﾛ鈷ｴ ﾙ�ﾘｱﾙ畏ｱ ﾘｴﾘｯﾙ� ﾘｨﾙ� ﾘｹﾙ�ﾙ畏ｧﾙ� ﾘｮﾙ畏ｧﾙ�ﾘｯﾙ� ﾘｴﾘｯﾙ�';
 $labels['afternseconds']  = 'ﾘｨﾘｹﾘｯ ﾘｧﾘｲ $s ﾘｫﾘｧﾙ�ﾛ雇�';
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index 5db68b005..ff53c650e 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾘｮﾘｷﾘｧﾛ� ﾙｾﾘｧﾛ顧ｯﾘｧﾙ�窶鈷ｯﾘｧﾘｯﾙ�';
 $messages['requesttimedout'] = 'ﾘｲﾙ�ﾘｧﾙ� ﾘｯﾘｱﾘｮﾙ畏ｧﾘｳﾘｪ ﾘｪﾙ�ﾘｧﾙ� ﾘｴﾘｯ';
 $messages['errorreadonly'] = 'ﾙ�ﾘｧﾘｪﾙ畏ｧﾙ�ﾛ� ﾘｯﾘｱ ﾘｧﾙ�ﾘｬﾘｧﾙ� ﾘｹﾙ�ﾙ�ﾛ鈷ｧﾘｪ. ﾙｾﾙ畏ｴﾙ� ﾙ�ﾙぺｷ ﾘｮﾙ畏ｧﾙ�ﾘｯﾙ�ﾛ� ﾘｧﾘｳﾘｪ.';
 $messages['errornoperm'] = 'ﾙ�ﾘｧﾘｪﾙ畏ｧﾙ�ﾛ� ﾘｯﾘｱ ﾘｧﾙ�ﾘｬﾘｧﾙ� ﾘｹﾙ�ﾙ�ﾛ鈷ｧﾘｪ. ﾘｯﾘｳﾘｪﾘｱﾘｳﾛ� ﾙ畏ｬﾙ畏ｯ ﾙ�ﾘｯﾘｧﾘｱﾘｯ.';
+$messages['erroroverquota'] = 'ﾙ�ﾘｧﾘｪﾙ畏ｧﾙ�ﾛ� ﾘｯﾘｱ ﾘｧﾙ�ﾘｬﾘｧﾙ� ﾘｹﾙ�ﾙ�ﾛ鈷ｧﾘｪ. ﾙ�ﾘｶﾘｧﾛ� ﾘｯﾛ鈷ｳﾚｩ ﾘｮﾘｧﾙ�ﾛ� ﾙ�ﾛ鈷ｳﾘｪ.';
+$messages['erroroverquotadelete'] = 'ﾙ�ﾘｶﾘｧﾛ� ﾘｯﾛ鈷ｳﾚｩ ﾘｮﾘｧﾙ�ﾛ� ﾙ�ﾛ鈷ｳﾘｪ. ﾘｨﾘｱﾘｧﾛ� ﾘｭﾘｰﾙ� ﾙｾﾛ鈷ｺﾘｧﾙ� ﾘｧﾘｲ SHIFT+DEL ﾘｧﾘｳﾘｪﾙ�ﾘｧﾘｯﾙ� ﾚｩﾙ�ﾛ鈷ｯ.';
 $messages['invalidrequest'] = 'ﾘｯﾘｱﾘｮﾙ畏ｧﾘｳﾘｪ ﾙ�ﾘｧﾙ�ﾘｹﾘｪﾘｨﾘｱ! ﾙ�ﾛ顧� ﾘｯﾘｧﾘｯﾙ�窶鈷ｧﾛ� ﾘｰﾘｮﾛ鈷ｱﾙ� ﾙ�ﾘｴﾘｯ.';
 $messages['invalidhost'] = 'ﾙ�ﾘｧﾙ� ﾘｳﾘｱﾙ畏ｱ ﾘｺﾛ鈷ｱﾙ�ﾘｹﾘｪﾘｨﾘｱ.';
 $messages['nomessagesfound'] = 'ﾙ�ﾛ顧� ﾙｾﾛ鈷ｺﾘｧﾙ�ﾛ� ﾘｯﾘｱ ﾘｧﾛ雇� ﾘｵﾙ�ﾘｯﾙ異� ﾙｾﾛ鈷ｯﾘｧ ﾙ�ﾘｴﾘｯ.';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index 99ccb242c..006f62947 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopioi';
 $labels['move']     = 'Siirrﾃ､';
 $labels['moveto']   = 'siirrﾃ､ kansioon...';
 $labels['download'] = 'lataa';
+$labels['open']     = 'Avaa';
 $labels['showattachment'] = 'Nﾃ､ytﾃ､';
 $labels['showanyway'] = 'Nﾃ､ytﾃ､ silti';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Nykyinen sivu';
 $labels['unread'] = 'Lukemattomat';
 $labels['flagged'] = 'Korostettu';
 $labels['unanswered'] = 'Vastaamaton';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Poistettu';
 $labels['undeleted'] = 'Ei poistettu';
 $labels['invert'] = 'Kﾃ､ﾃ､nnﾃ､';
@@ -204,6 +206,8 @@ $labels['body']  = 'Runko';
 
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
+$labels['changeformattext'] = 'Nﾃ､ytﾃ､ raakatekstimuodossa';
+$labels['changeformathtml'] = 'Nﾃ､ytﾃ､ HTML-muodossa';
 
 // message compose
 $labels['editasnew']      = 'Muokkaa uutena';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Kirjoita HTML-muodossa';
 $labels['htmlonreply'] = 'Vain vastatessa HTML-viesteihin';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML-allekirjoitus';
+$labels['showemail'] = 'Nﾃ､ytﾃ､ sﾃ､hkﾃｶpostiosoite nﾃ､yttﾃｶnimen kanssa';
 $labels['previewpane'] = 'Nﾃ､ytﾃ､ esikatselulehti';
 $labels['skin'] = 'Kﾃ､yttﾃｶliittymﾃ､n teema';
 $labels['logoutclear'] = 'Tyhjennﾃ､ roskakori kirjautuessa ulos';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Vastattaessa poista alkuperﾃ､inen allekirjoit
 $labels['autoaddsignature'] = 'Lisﾃ､ﾃ､ allekirjoitus automaattisesti';
 $labels['newmessageonly'] = 'vain uuteen viestiin';
 $labels['replyandforwardonly'] = 'vain vastauksiin ja vﾃ､lityksiin';
-$labels['replysignaturepos'] = 'Vastattaessa tai vﾃ､litettﾃ､essﾃ､ laita allekirjoitus';
-$labels['belowquote'] = 'lainauksen alle';
-$labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisﾃ､ﾃ､ allekirjoitus';
 $labels['previewpanemarkread']  = 'Merkitse esikatsellut viestit luetuiksi';
 $labels['afternseconds']  = '$n sekunnin jﾃ､lkeen';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index 035ba411f..3a8c393d6 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Tietokantavirhe!';
 $messages['requesttimedout'] = 'Pyyntﾃｶ aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
+$messages['erroroverquota'] = 'Toiminnon suoritus epﾃ､onnistui. Levytila on loppu.';
+$messages['erroroverquotadelete'] = 'Levytila on loppu. Paina SHIFT+DEL poistaaksesi viestin.';
 $messages['invalidrequest'] = 'Virheellinen pyyntﾃｶ! Tietoa ei tallennettu.';
 $messages['invalidhost'] = 'Virheellinen palvelinnimi.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sﾃ､hkﾃｶpostiviestejﾃ､';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 29e2c028b..6731ecc3f 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copier';
 $labels['move']     = 'Dﾃｩplacer';
 $labels['moveto']   = 'Dﾃｩplacer vers...';
 $labels['download'] = 'Tﾃｩlﾃｩcharger';
+$labels['open']     = 'Ouvrir';
 $labels['showattachment'] = 'Afficher';
 $labels['showanyway'] = 'Afficher quand mﾃｪme';
 
@@ -142,7 +143,7 @@ $labels['firstmessage']     = 'Voir le premier message';
 $labels['nextmessage']      = 'Voir le message suivant';
 $labels['lastmessage']      = 'Voir le dernier message';
 $labels['backtolist']       = 'Retourner ﾃ� la liste des messages';
-$labels['viewsource']       = 'Voir le source';
+$labels['viewsource']       = 'Voir la source';
 $labels['mark']             = 'Marquer';
 $labels['markmessages']     = 'Marquer les messages';
 $labels['markread']         = 'Comme lus';
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Page courante';
 $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marquﾃｩ';
 $labels['unanswered'] = 'Non rﾃｩpondu';
+$labels['withattachment'] = 'Avec piﾃｨce jointe';
 $labels['deleted'] = 'Supprimﾃｩ';
 $labels['undeleted'] = 'Non supprimﾃｩ';
 $labels['invert'] = 'Inverser';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corps';
 
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenﾃｪtre';
 $labels['emlsave'] = 'Tﾃｩlﾃｩcharger (.eml)';
+$labels['changeformattext'] = 'Afficher au format texte';
+$labels['changeformathtml'] = 'Afficher au format HTML';
 
 // message compose
 $labels['editasnew']      = 'ﾃ嬰iter en tant que nouveau message';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Composer un message au format HTML';
 $labels['htmlonreply'] = 'en rﾃｩponse aux messages HTML uniquement';
 $labels['htmlonreplyandforward'] = 'Transfﾃｩrer ou rﾃｩpondre au message HTML';
 $labels['htmlsignature'] = 'Signature HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Afficher le panneau d\'aperﾃｧu';
 $labels['skin'] = 'Thﾃｨme de l\'interface';
 $labels['logoutclear'] = 'Vider la corbeille ﾃ� la dﾃｩconnexion';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'En rﾃｩpondant, supprimer la signature d\'orig
 $labels['autoaddsignature'] = 'Ajouter la signature automatiquement';
 $labels['newmessageonly'] = 'nouveau message uniquement';
 $labels['replyandforwardonly'] = 'rﾃｩponses et transferts uniquement';
-$labels['replysignaturepos'] = 'En rﾃｩpondant ou en transfﾃｩrant, placer la signature';
-$labels['belowquote'] = 'en-dessous de la citation';
-$labels['abovequote'] = 'au-dessus de la citation';
 $labels['insertsignature'] = 'Insﾃｩrer la signature';
 $labels['previewpanemarkread']  = 'Marquer les messages prﾃｩvisualisﾃｩs comme lus';
 $labels['afternseconds']  = 'aprﾃｨs $n secondes';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index bd3fd2094..a736e103e 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Erreur avec la base de donnﾃｩe!';
 $messages['requesttimedout'] = 'Dﾃｩlai de la requﾃｪte expirﾃｩ';
 $messages['errorreadonly'] = 'Impossible d\'effectuer cette opﾃｩration. Le dossier est en lecture seule';
 $messages['errornoperm'] = 'Impossible d\'effectuer cette opﾃｩration. Permission refusﾃｩe';
+$messages['erroroverquota'] = 'Impossible d\'effectuer cette opﾃｩration. Plus d\'espace libre.';
+$messages['erroroverquotadelete'] = 'Plus d\'espace libre. Utilisez SHIFT+DEL pour supprimer un message.';
 $messages['invalidrequest'] = 'Requﾃｪte invalide ! Aucune donnﾃｩe n\'a ﾃｩtﾃｩ sauvegardﾃｩe.';
 $messages['invalidhost'] = 'Nom du serveur invalide.';
 $messages['nomessagesfound'] = 'Cette boﾃｮte aux lettres ne contient aucun message.';
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index cd6154626..891371f58 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieare';
 $labels['move']     = 'Ferplaatse';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Delhelje';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Toane';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 795295eb2..9f0da6550 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Cﾃｳipeﾃ｡il';
 $labels['move']     = 'Bog';
 $labels['moveto']   = 'bog go...';
 $labels['download'] = 'sﾃｭos-luchtﾃｺ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na rudaﾃｭ nach bhuil corraithe';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Scrﾃｭobh teachtaireachta HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Mana clabhsﾃｺir HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Taispeﾃ｡in an pﾃ｡na rﾃｩamhamharc';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 140b88639..70aa28a36 100755
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nﾃｭ bhfuair mﾃｩ aon teachtaireacht i bosca postas seo';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 3c5b60026..5905ea4b9 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Correo lixo';
 // message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitente';
 $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Copia (Cc)';
 $labels['bcc']     = 'Copia oculta (Cco)';
@@ -58,14 +58,15 @@ $labels['mailboxlist'] = 'Cartafoles';
 $labels['messagesfromto'] = 'Mensaxes da $from ﾃ｡ $to de $count';
 $labels['threadsfromto'] = 'Fﾃｭos do $from ao $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
-$labels['fromtoshort'] = '$from 窶� $to of $count';
+$labels['fromtoshort'] = '$from - $to de $count';
 
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['open']     = 'Abrir';
+$labels['showattachment'] = 'Amosar';
+$labels['showanyway'] = 'Amosala de tﾃｳdolos xeitos';
 
 $labels['filename'] = 'Nome de ficheiro';
 $labels['filesize'] = 'Tamaﾃｱo de ficheiro';
@@ -130,7 +131,7 @@ $labels['replytomessage']   = 'Respostar a mensaxe';
 $labels['replytoallmessage'] = 'Respostar ﾃ｡ lista ou ao remitente e a tﾃｳdolos destinatarios';
 $labels['replyall']         = 'Respostar a todos';
 $labels['replylist']        = 'Respostar ﾃ｡ lista de correo';
-$labels['forward']          = 'Forward';
+$labels['forward']          = 'Reenviar';
 $labels['forwardinline']    = 'Reenviar inserido';
 $labels['forwardattachment'] = 'Reenviar como anexo';
 $labels['forwardmessage']   = 'Reenviar a mensaxe';
@@ -143,7 +144,7 @@ $labels['nextmessage']      = 'Amosar a seguinte mensaxe';
 $labels['lastmessage']      = 'Amosar a ﾃｺltima mensaxe';
 $labels['backtolist']       = 'Voltar ﾃ｡ lista de mensaxes';
 $labels['viewsource']       = 'Ver cﾃｳdigo fonte';
-$labels['mark']             = 'Mark';
+$labels['mark']             = 'Marcar';
 $labels['markmessages']     = 'Marcar mensaxes';
 $labels['markread']         = 'Como lidas';
 $labels['markunread']       = 'Como non lidas';
@@ -161,8 +162,9 @@ $labels['currpage'] = 'Pﾃ｡xina actual';
 $labels['unread'] = 'Non lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Non respostadas';
+$labels['withattachment'] = 'Con anexo';
 $labels['deleted'] = 'Marcadas como eliminadas';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'Non borradas';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -200,14 +202,16 @@ $labels['quicksearch']  = 'Busca rﾃ｡pida';
 $labels['resetsearch']  = 'Restablecer a busca';
 $labels['searchmod']  = 'Modificadores de busca';
 $labels['msgtext']  = 'Mensaxe enteira';
-$labels['body']  = 'Body';
+$labels['body']  = 'Corpo';
 
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
+$labels['changeformattext'] = 'Amosar en texto plano';
+$labels['changeformathtml'] = 'Amosar en HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nova';
-$labels['send']           = 'Send';
+$labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar a mensaxe agora';
 $labels['savemessage']    = 'Gardar a mensaxe como borrador';
 $labels['addattachment']  = 'Anexar un ficheiro';
@@ -219,12 +223,12 @@ $labels['mailreplyintro'] = 'O $date, $sender escribiu:';
 $labels['originalmessage'] = 'Mensaxe orixinal';
 
 $labels['editidents']    = 'Modificar identidades';
-$labels['spellcheck']    = 'Spell';
+$labels['spellcheck']    = 'Ortografﾃｭa';
 $labels['checkspelling'] = 'Revisar a ortografﾃｭa';
 $labels['resumeediting'] = 'Voltar ﾃ｡ ediciﾃｳn';
 $labels['revertto']      = 'Voltar a';
 
-$labels['attach'] = 'Attach';
+$labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Ficheiros anexos';
 $labels['upload'] = 'Cargar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
@@ -241,9 +245,9 @@ $labels['nosubject']  = '(Sen asunto)';
 $labels['showimages'] = 'Amosar as imaxes';
 $labels['alwaysshow'] = 'Amosar sempre as imaxes nas mensaxes de $sender';
 $labels['isdraft']    = 'Esta mensaxe ﾃｩ un borrador';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['andnmore']   = '$nr mﾃ｡is...';
+$labels['togglemoreheaders'] = 'Amosar mﾃ｡is cabecerias';
+$labels['togglefullheaders'] = 'Conmutar cabeceiras en bruto';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Sﾃｳ texto';
@@ -335,13 +339,13 @@ $labels['composeto']      = 'Redactar mensaxe para';
 $labels['contactsfromto'] = 'Contactos do $from ao $to de $count';
 $labels['print']          = 'Imprimir';
 $labels['export']         = 'Exportar';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Exportar todas';
+$labels['exportsel']      = 'Exportar as seleccionadas';
 $labels['exportvcards']   = 'Exportar os contactos en formato vCard';
 $labels['newcontactgroup'] = 'Crear novo grupo de contactos';
 $labels['grouprename']    = 'Mudar o nome do grupo';
 $labels['groupdelete']    = 'Borrar o grupo';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
+$labels['groupremoveselected'] = 'Eliminar do grupo os contactos seleccionados';
 
 $labels['previouspage']   = 'Amosar o grupo anterior';
 $labels['firstpage']      = 'Amosar o primeiro grupo';
@@ -360,7 +364,7 @@ $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde ficheiro:';
 $labels['importtarget'] = 'Engadir contactos ao caderno de enderezos:';
 $labels['importreplace'] = 'Substituﾃｭr completamente o caderno de enderezos';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Pode cargar contactos desde un caderno de enderezos preexistente.<br/>Pﾃｳdense importar enderezos en formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por comas)';
 $labels['done'] = 'Rematado';
 
 // settings
@@ -380,8 +384,8 @@ $labels['edititem'] = 'Editar';
 $labels['preferhtml'] = 'Prefiro HTML';
 $labels['defaultcharset'] = 'Xogo de caracteres por omisiﾃｳn';
 $labels['htmlmessage'] = 'Mensaxe HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Sinatura dixital';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Data decorada';
@@ -392,12 +396,13 @@ $labels['timezone']  = 'Zona horaria';
 $labels['pagesize']  = 'Liﾃｱas por pﾃ｡xina';
 $labels['signature'] = 'Sinatura';
 $labels['dstactive']  = 'Cambio de hora segﾃｺn horario de verﾃ｡n';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['showinextwin'] = 'Abrir a mensaxe nunha nova xanela';
+$labels['composeextwin'] = 'Redactar nunha xanela nova';
 $labels['htmleditor'] = 'Redactar mensaxes HTML';
 $labels['htmlonreply'] = 'sﾃｳ cando se resposte a unha mensaxe HTML';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'ao reenviar ou respostar a unha mensaxe HTML';
 $labels['htmlsignature'] = 'Sinatura HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Amosar previsualizaciﾃｳn';
 $labels['skin'] = 'Aspecto da interface';
 $labels['logoutclear'] = 'Baleirar o cubo do lixo ao saﾃｭr';
@@ -415,14 +420,14 @@ $labels['readwhendeleted'] = 'Marcar a mensaxe como lida ao eliminar';
 $labels['flagfordeletion'] = 'Marcar a mensaxe para eliminar no canto de eliminar';
 $labels['skipdeleted'] = 'Non amosar as mensaxes marcadas como eliminadas';
 $labels['deletealways'] = 'Eliminar as mensaxes aﾃｭnda que non se poidan gardar no cubo do lixo';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['deletejunk'] = 'Borrar automﾃ｡ticamente as mensaxes no cartafol "Correo lixo"';
 $labels['showremoteimages'] = 'Amosar as imaxes remotas';
 $labels['fromknownsenders'] = 'de remitentes coﾃｱecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Amosar as imaxes anexas baixo a mensaxe';
 $labels['autosavedraft']  = 'Gardar borrador automﾃ｡ticamente';
 $labels['everynminutes']  = 'cada $n minuto(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = 'Refrescar (buscar novas mensaxes, etc)';
 $labels['never']  = 'nunca';
 $labels['immediately']  = 'de inmediato';
 $labels['messagesdisplaying'] = 'Visualizaciﾃｳn das mensaxes';
@@ -444,35 +449,32 @@ $labels['maintenance'] = 'Mantemento';
 $labels['newmessage'] = 'Mensaxes novas';
 $labels['signatureoptions'] = 'Opciﾃｳns da firma';
 $labels['whenreplying'] = 'Ao respostar';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = 'non citar a mensaxe orixinal';
 $labels['replytopposting'] = 'comezar a nova mensaxe enriba da orixinal';
 $labels['replybottomposting'] = 'comezar a nova mensaxe embaixo da orixinal';
 $labels['replyremovesignature'] = 'Eliminar a firma do remitente ao respostar';
 $labels['autoaddsignature'] = 'Engadir firma automﾃ｡ticamente';
 $labels['newmessageonly'] = 'sﾃｳ nas mensaxes novas';
 $labels['replyandforwardonly'] = 'sﾃｳ nas respostas e reenvﾃｭos';
-$labels['replysignaturepos'] = 'Ao respostar ou reenviar colocar a firma';
-$labels['belowquote'] = 'embaixo do texto citado';
-$labels['abovequote'] = 'enriba do texto citado';
 $labels['insertsignature'] = 'Engadir firma';
 $labels['previewpanemarkread']  = 'Marcar como lidas as mensaxes previsualizadas';
 $labels['afternseconds']  = 'logo de $n segundos';
 $labels['reqmdn'] = 'Solicitar sempre unha notificaciﾃｳn da entrega';
 $labels['reqdsn'] = 'Solicitar sempre unha notificaciﾃｳn do estado de envﾃｭo';
 $labels['replysamefolder'] = 'Deixar as respostas no cartafol onde estﾃ｡ a mensaxe ﾃ｡ que se responde';
-$labels['defaultabook'] = 'Default address book';
+$labels['defaultabook'] = 'Caderno de enderezos por defecto';
 $labels['autocompletesingle'] = 'Ignorar as direcciﾃｳns alternativas no autocompletado';
-$labels['listnamedisplay'] = 'List contacts as';
+$labels['listnamedisplay'] = 'Listar os contactos coma';
 $labels['spellcheckbeforesend'] = 'Revisar a ortografﾃｭa antes de enviar unha mensaxe';
 $labels['spellcheckoptions'] = 'Opciﾃｳn da revisiﾃｳn ortogrﾃ｡fica';
 $labels['spellcheckignoresyms'] = 'Ignorar as palabras con sﾃｭmbolos';
 $labels['spellcheckignorenums'] = 'Ignorar as palabras con nﾃｺmeros';
 $labels['spellcheckignorecaps'] = 'Ignorar as palabras escritas en maiﾃｺsculas';
 $labels['addtodict'] = 'Engadir ao diccionario';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['mailtoprotohandler'] = 'Rexistrar o manexador de protocolo para as ligazﾃｳns "mailto:"';
+$labels['forwardmode'] = 'Reenvio de mensaxes';
+$labels['inline'] = 'inserido';
+$labels['asattachment'] = 'coma anexo';
 
 $labels['folder']  = 'Cartafol';
 $labels['folders']  = 'Cartafoles';
@@ -500,7 +502,7 @@ $labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
 $labels['undo'] = 'Desfacer';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = 'Complementos instalados';
 $labels['plugin'] = 'Complemento';
 $labels['version'] = 'Versiﾃｳn';
 $labels['source'] = 'Fonte';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 6f230bc89..207a016a1 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -17,7 +17,7 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'An error occurred!';
+$messages['errortitle']  = 'Ocurreu un erro!';
 $messages['loginfailed']  = 'O contrasinal ou o nome de usuario son incorrectos.';
 $messages['cookiesdisabled'] = 'O seu navegador non acepta galletas.';
 $messages['sessionerror'] = 'A sﾃｺa sesiﾃｳn non ﾃｩ vﾃ｡lida ou expirou.';
@@ -25,15 +25,17 @@ $messages['storageerror'] = 'Fallou a conexiﾃｳn co servidor IMAP.';
 $messages['servererror'] = 'Erro do servidor!';
 $messages['servererrormsg'] = 'Erro do servidor: $msg';
 $messages['dberror'] = 'Erro na base de datos!';
-$messages['requesttimedout'] = 'Request timed out';
+$messages['requesttimedout'] = 'A peticiﾃｳn expirou';
 $messages['errorreadonly'] = 'Non foi posible realizar a operaciﾃｳn. O cartafol ﾃｩ de sﾃｳ lectura.';
 $messages['errornoperm'] = 'Non foi posible realizar a operaciﾃｳn. Permiso denegado.';
+$messages['erroroverquota'] = 'Non se pode realizar a operaciﾃｳn, non hai espacio no disco.';
+$messages['erroroverquotadelete'] = 'Non hai espacio no disco. Utilice Maiﾃｺsculas+Supr para borrar unha mensaxe.';
 $messages['invalidrequest'] = 'Peticiﾃｳn invﾃ｡lida!. Non se gardou ningﾃｺn dato.';
-$messages['invalidhost'] = 'Invalid server name.';
+$messages['invalidhost'] = 'O nome do servidor non ﾃｩ vﾃ｡lido.';
 $messages['nomessagesfound'] = 'Non se atoparon mensaxes nesta caixa de correo.';
 $messages['loggedout'] = 'Rematou correctamente a sﾃｺa sesiﾃｳn. Ata logo!';
 $messages['mailboxempty'] = 'A caixa de correo estﾃ｡ vacﾃｭa.';
-$messages['refreshing'] = 'Refreshing...';
+$messages['refreshing'] = 'A refrescar...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Cargando ficheiro...';
 $messages['uploadingmany'] = 'Cargando ficheiros...';
@@ -112,16 +114,16 @@ $messages['addingmember'] = 'Engadindo o(s) contacto(s) ao grupo...';
 $messages['removingmember'] = 'Eliminando o(s) contacto(s) do grupo...';
 $messages['receiptsent'] = 'A notificaciﾃｳn da entrega enviouse correctamente.';
 $messages['errorsendingreceipt'] = 'Non foi posible enviar a notificaciﾃｳn da entrega.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['deleteidentityconfirm'] = 'Quere eliminar esta identidade?';
 $messages['nodeletelastidentity'] = 'Non pode eliminar esta identidade, ﾃｩ a ﾃｺltima.';
 $messages['forbiddencharacter'] = 'O nome do cartafol contﾃｩn un carﾃ｡cter non vﾃ｡lido.';
 $messages['selectimportfile'] = 'Por favor, escolla un ficheiro para cargar.';
 $messages['addresswriterror'] = 'Non se pode escribir no caderno de enderezos que escolleu.';
 $messages['contactaddedtogroup'] = 'Engadiuse correctamente o contacto a este grupo.';
 $messages['contactremovedfromgroup'] = 'Suprimiuse correctamente o contacto deste grupo.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'Non cambiou ningunha asignaciﾃｳn de grupo.';
 $messages['importwait'] = 'A importar. Por favor, agarde...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = 'Fallou a importaciﾃｳn! O ficheiro cargado non contﾃｩn datos vﾃ｡lidos.';
 $messages['importconfirm'] = '<b>Importﾃ｡ronse correctamente $inserted contactos. Ignorﾃ｡ronse $skipped contactos que xa existﾃｭan</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Ignorﾃ｡ronse $skipped existing entradas</b>';
 $messages['opnotpermitted'] = 'Operaciﾃｳn non permitida!';
@@ -162,8 +164,8 @@ $messages['foldercreated'] = 'O cartafol creouse correctamente.';
 $messages['invalidimageformat'] = 'O formato da imaxe non ﾃｩ vﾃ｡lido.';
 $messages['mispellingsfound'] = 'Atopﾃ｡ronse erros ortogrﾃ｡ficos na mensaxe.';
 $messages['parentnotwritable'] = 'Non foi posible crear/mover o cartafol no cartafol padre escollido porque non ten permisos.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['messagetoobig'] = 'A mensaxe ﾃｩ demasiado grande para procesala';
+$messages['attachmentvalidationerror'] = 'ATENCIﾃ哲! Este anexo ﾃｩ sospeitoso porque o seu tipo non coincide o tipo declarado na mensaxe. Se non confﾃｭa no remitente, non deberﾃｭa abrilo, porque poderﾃｭa conter un virus ou malware.<br/><br/><em>Tipo agardado: $expected; Tipo detectado: $detected</em>';
+$messages['noscriptwarning'] = 'Atenciﾃｳn: Este servicio de correo web precisa de Javascript!. Por favor, active javascript nas opciﾃｳn do seu navegador.';
 
 ?>
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 8cf6101f5..bfb9e2fef 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾗ蕃｢ﾗｪﾗｧ';
 $labels['move']     = 'ﾗ蕃｢ﾗ泰ｨ';
 $labels['moveto']   = 'ﾗｪﾗ燮勉ｧ ﾗ�...';
 $labels['download'] = 'ﾗ蕃勉ｨﾗ沌�';
+$labels['open']     = 'ﾗ慵､ﾗｪﾗ勉�';
 $labels['showattachment'] = 'ﾗ蕃ｦﾗ潰�';
 $labels['showanyway'] = 'ﾗ慵蕃ｦﾗ燮� ﾗ泰嶼� ﾗ槞ｧﾗｨﾗ�';
 
@@ -132,7 +133,7 @@ $labels['replyall']         = 'ﾗ槞｢ﾗ�ﾗ� ﾗ慵嶼勉慵�';
 $labels['replylist']        = 'ﾗ槞｢ﾗ�ﾗ� ﾗ慵ｨﾗｩﾗ燮槞ｪ ﾗｪﾗ､ﾗ勉ｦﾗ�';
 $labels['forward']          = 'ﾗ蕃｢ﾗ泰ｨﾗ�';
 $labels['forwardinline']    = 'ﾗ蕃｢ﾗ泰ｨ ﾗ泰潰勉｣ ﾗ蕃蕃勉沌｢ﾗ�';
-$labels['forwardattachment'] = 'ﾗ蕃｢ﾗ泰ｨ ﾗ嶼ｧﾗ勉泰･ ﾗ槞ｦﾗ勉ｨﾗ｣';
+$labels['forwardattachment'] = 'ﾗ蕃｢ﾗ泰ｨ ﾗ嶼ｦﾗｨﾗ勉､ﾗ�';
 $labels['forwardmessage']   = 'ﾗ蕃｢ﾗ泰ｨ ﾗ蕃勉沌｢ﾗ�';
 $labels['deletemessage']    = 'ﾗ槞隣燮ｧﾗ�';
 $labels['movemessagetotrash'] = 'ﾗ蕃ｩﾗ慵嶼� ﾗ慵碩ｩﾗ､ﾗ�';
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾗ沌｣ ﾗ�ﾗ勉嶼隣�';
 $labels['unread'] = 'ﾗ慵� ﾗ�ﾗｧﾗｨﾗ碩�';
 $labels['flagged'] = 'ﾗ槞｡ﾗ勉槞�';
 $labels['unanswered'] = 'ﾗ慵� ﾗ�ﾗ｢ﾗ�ﾗ�';
+$labels['withattachment'] = 'ﾗ｢ﾗ� ﾗｦﾗｨﾗ勉､ﾗ�';
 $labels['deleted'] = 'ﾗ�ﾗ槞隣ｧ';
 $labels['undeleted'] = 'ﾗ慵� ﾗ�ﾗ槞隣ｧ';
 $labels['invert'] = 'ﾗ蕃燮､ﾗ勉� ﾗ蕃｡ﾗ燮槞勉�';
@@ -204,6 +206,8 @@ $labels['body']  = 'ﾗ潰勉｣ ﾗ蕃蕃勉沌｢ﾗ�';
 
 $labels['openinextwin'] = 'ﾗ､ﾗｪﾗ燮隣� ﾗ泰隣慵勉� ﾗ隣沌ｩ';
 $labels['emlsave'] = 'ﾗ蕃勉ｨﾗ沌ｪ ﾗ蕃勉沌｢ﾗ� ﾗ泰､ﾗ勉ｨﾗ槞�  EML';
+$labels['changeformattext'] = 'ﾗ蕃ｦﾗ潰� ﾗ泰､ﾗ勉ｨﾗ槞� ﾗ慵� ﾗ槞｢ﾗ勉ｦﾗ�';
+$labels['changeformathtml'] = 'ﾗ蕃ｦﾗ潰� ﾗ泰､ﾗ勉ｨﾗ槞� HTML';
 
 // message compose
 $labels['editasnew']      = 'ﾗ｢ﾗｨﾗ燮嶼ｪ ﾗ蕃蕃勉沌｢ﾗ� ﾗ嶼隣沌ｩﾗ�';
@@ -225,7 +229,7 @@ $labels['resumeediting'] = 'ﾗ蕃槞ｩﾗ� ﾗ｢ﾗｨﾗ燮嶼�';
 $labels['revertto']      = 'ﾗ隣儲勉ｨ ﾗ慵槞ｦﾗ� ﾗｧﾗ勉沌�';
 
 $labels['attach'] = 'ﾗｦﾗ燮ｨﾗ勉｣';
-$labels['attachments'] = 'ﾗｧﾗ泰ｦﾗ燮� ﾗ槞ｦﾗ勉ｨﾗ､ﾗ燮�';
+$labels['attachments'] = 'ﾗｦﾗｨﾗ勉､ﾗ勉ｪ';
 $labels['upload'] = 'ﾗ蕃｢ﾗ慵碩�';
 $labels['uploadprogress'] = '( $total  ﾗ槞ｪﾗ勉�  $current )  $percent';
 $labels['close']  = 'ﾗ｡ﾗ潰燮ｨﾗ�';
@@ -400,6 +404,7 @@ $labels['htmleditor'] = 'ﾗ燮ｦﾗ燮ｨﾗｪ ﾗ蕃勉沌｢ﾗ� ﾗ槞｢ﾗ勉ｦﾗ泰ｪ';
 $labels['htmlonreply'] = 'ﾗｨﾗｧ ﾗ泰槞｢ﾗ�ﾗ� ﾗ慵蕃勉沌｢ﾗｪ HTML';
 $labels['htmlonreplyandforward'] = 'ﾗ慵蕃｢ﾗ泰燮ｨ ﾗ碩� ﾗ慵蕃ｩﾗ燮� ﾗ慵蕃勉沌｢ﾗ� ﾗｩﾗ蕃潰燮｢ﾗ� ﾗ泰､ﾗ勉ｨﾗ槞� HTML';
 $labels['htmlsignature'] = 'ﾗ隣ｪﾗ燮槞� ﾗ槞｢ﾗ勉ｦﾗ泰ｪ';
+$labels['showemail'] = 'ﾗ蕃ｦﾗ潰ｪ ﾗ嶼ｪﾗ勉泰ｪ ﾗ沌勉�"ﾗ� ﾗ｢ﾗ� ﾗｩﾗ� ﾗ蕃ｩﾗ勉慵�';
 $labels['previewpane'] = 'ﾗｪﾗｦﾗ勉潰� ﾗ槞勉ｧﾗ沌槞ｪ';
 $labels['skin'] = 'ﾗ｢ﾗｨﾗ嶼ｪ ﾗ槞ｨﾗ碩�';
 $labels['logoutclear'] = 'ﾗｨﾗ燮ｧﾗ勉� ﾗ｡ﾗ� ﾗ碩ｩﾗ､ﾗ� ﾗ泰燮ｦﾗ燮碩�';
@@ -453,9 +458,6 @@ $labels['replyremovesignature'] = 'ﾗ蕃隣ｪﾗ燮槞� ﾗｪﾗ勉｡ﾗｨ ﾗ槞蕃蕃勉沌｢ﾗ� ﾗ蕃槞ｧﾗ�
 $labels['autoaddsignature'] = 'ﾗ蕃勉｡ﾗ､ﾗ� ﾗ碩勉俎勉槞俎燮ｪ ﾗｩﾗ� ﾗ隣ｪﾗ燮槞�';
 $labels['newmessageonly'] = 'ﾗ蕃勉沌｢ﾗ� ﾗ隣沌ｩﾗ� ﾗ泰慵泰�';
 $labels['replyandforwardonly'] = 'ﾗ槞｢ﾗ�ﾗ� ﾗ勉蕃｢ﾗ泰ｨﾗｪ ﾗ蕃勉沌｢ﾗ� ﾗ泰慵泰�';
-$labels['replysignaturepos'] = 'ﾗ泰槞｢ﾗ�ﾗ� ﾗ碩� ﾗ泰蕃｢ﾗ泰ｨﾗｪ ﾗ蕃勉沌｢ﾗ�, ﾗ蕃隣ｪﾗ燮槞� ﾗｪﾗ勉､ﾗ燮｢';
-$labels['belowquote'] = 'ﾗ泰｡ﾗ勉｣ ﾗ蕃蕃勉沌｢ﾗ� ﾗ蕃槞ｧﾗ勉ｨﾗ燮ｪ';
-$labels['abovequote'] = 'ﾗ泰ｪﾗ隣燮慵ｪ ﾗ蕃蕃勉沌｢ﾗ� ﾗ蕃槞ｧﾗ勉ｨﾗ燮ｪ';
 $labels['insertsignature'] = 'ﾗｩﾗ燮泰勉･ ﾗ隣ｪﾗ燮槞�';
 $labels['previewpanemarkread']  = 'ﾗ｡ﾗ燮槞勉� ﾗ蕃勉沌｢ﾗ� ﾗｩﾗ�ﾗｦﾗ､ﾗｪﾗ� ﾗ嶼�ﾗｧﾗｨﾗ碩�';
 $labels['afternseconds']  = 'ﾗ慵碩隣ｨ $n ﾗｩﾗ�ﾗ燮勉ｪ';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index be4ef2824..7d9b87c06 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '! ﾗｩﾗ潰燮碩� ﾗ泰槞｡ﾗ� ﾗ蕃�ﾗｪﾗ勉�ﾗ燮�';
 $messages['requesttimedout'] = 'ﾗｪﾗ� ﾗ蕃儲槞� ﾗ蕃槞勉ｧﾗｦﾗ� ﾗ慵泰ｧﾗｩﾗ�';
 $messages['errorreadonly'] = 'ﾗ慵� ﾗ�ﾗ燮ｪﾗ� ﾗ慵泰ｦﾗ｢ ﾗ蕃､ﾗ｢ﾗ勉慵� ﾗ嶼� ﾗ蕃ｪﾗ燮ｧ ﾗ�ﾗ燮ｪﾗ� ﾗ慵ｧﾗｨﾗ燮碩� ﾗ泰慵泰�';
 $messages['errornoperm'] = 'ﾗ慵� ﾗ�ﾗ燮ｪﾗ� ﾗ慵泰ｦﾗ｢ ﾗ蕃､ﾗ｢ﾗ勉慵� ﾗ嶼� ﾗ碩燮� ﾗ蕃ｨﾗｩﾗ碩� ﾗ慵泰ｦﾗ｢ﾗ�';
+$messages['erroroverquota'] = 'ﾗ慵� ﾗ�ﾗ燮ｪﾗ� ﾗ慵泰ｦﾗ｢ ﾗ蕃､ﾗ｢ﾗ勉慵� ﾗ嶼� ﾗ慵� ﾗ槞ｧﾗ勉� ﾗ､ﾗ�ﾗ勉� ﾗ｢ﾗ� ﾗ蕃沌燮｡ﾗｧ';
+$messages['erroroverquotadelete'] = 'ﾗ碩燮� ﾗ槞ｧﾗ勉� ﾗ､ﾗ�ﾗ勉� ﾗ｢ﾗ� ﾗ蕃沌燮｡ﾗｧ. ﾗ燮ｩ ﾗ慵蕃ｩﾗｪﾗ槞ｩ ﾗ� SHIFT+DELETE ﾗ嶼沌� ﾗ慵槞隣勉ｧ ﾗ蕃蕃勉沌｢ﾗ�';
 $messages['invalidrequest'] = 'ﾗ泰ｧﾗｩﾗ� ﾗ慵� ﾗ隣勉ｧﾗ燮ｪ. ﾗ蕃槞燮沌｢ ﾗ慵� ﾗ�ﾗｩﾗ槞ｨ';
 $messages['invalidhost'] = 'ﾗｩﾗ� ﾗｩﾗｨﾗｪ ﾗ慵� ﾗ隣勉ｧﾗ�';
 $messages['nomessagesfound'] = 'ﾗ慵� ﾗ�ﾗ槞ｦﾗ碩� ﾗ蕃勉沌｢ﾗ勉ｪ ﾗ泰ｪﾗ燮泰� ﾗ儲�';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 8188b8eca..3b8279f71 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '爨歩､ｾ爨ｰ爭財､ｬ爨ｨ';
 $labels['move']     = '爨ｸ爭財､･爨ｾ爨ｨ爨ｾ爨も､､爨ｰ爨ｿ爨､ 爨歩､ｰ爭�爨�';
 $labels['moveto']   = '爨籾･�爨ｸ爭財､歩､ｾ爨説､�...';
 $labels['download'] = '爨｡爨ｾ爨癌､ｨ爨ｲ爭金､｡';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = '爨�爨ｨ爨ｦ爭�爨籾･�';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '爨ｮ爭�爨ｲ 爨説､�-爨游･�-爨説､ｮ-爨鐘､ｲ (HTML) 爨ｮ爭� 爨ｲ
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '爨説､�-爨游･�-爨説､ｮ-爨鐘､ｲ (HTML) 爨ｦ爨ｸ爭財､､爨籾､､';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '爨杳､ｲ爨� 爨ｪ爨游･財､游･� 爨ｦ爨ｿ爨籾､ｾ爨説､�';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 328dbe00e..1d55f5c48 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '爨�爨ｸ 爨ｮ爭�爨ｲ爨ｬ爭霞､歩･財､ｸ 爨ｮ爭�爨� 爨歩･金､� 爨ｮ爭�爨ｲ 爨ｨ爨ｹ爭�爨� 爨ｹ爭�';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index d7b1b2041..506d50f1f 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premjesti';
 $labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi (download)';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Neproﾄ絞tane';
 $labels['flagged'] = 'Oznaﾄ稿ne';
 $labels['unanswered'] = 'Neodgovrene';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Obrisano';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Obrni';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Uredi kao novo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Sastavi HTML poruke';
 $labels['htmlonreply'] = 'odgovor samo na HTML poruke';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML potpis';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prikaﾅｾi podruﾄ綱e pregleda';
 $labels['skin'] = 'Tema izgleda';
 $labels['logoutclear'] = 'Oﾄ絞sti smeﾄ�e pri izlazu';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Kod odgovaranja, makni originalni potpis iz p
 $labels['autoaddsignature'] = 'Automatski dodaj potpis';
 $labels['newmessageonly'] = 'samo nova poruka';
 $labels['replyandforwardonly'] = 'samo odgovori i proslijeﾄ訴vanja';
-$labels['replysignaturepos'] = 'Kod downloada ili proslijeﾄ訴vanja postavi potpis';
-$labels['belowquote'] = 'ispod citata';
-$labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
 $labels['previewpanemarkread']  = 'Obiljeﾅｾi pregledane poruke kao proﾄ絞tane';
 $labels['afternseconds']  = 'nakon $n sekundi';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index c3a4f1779..3e6cc6daf 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Greﾅ｡ka baze podataka!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Nemoguﾄ�a izvedba operacije. Mapa je samo za ﾄ絞tanje.';
 $messages['errornoperm'] = 'Nemoguﾄ�a izvedba operacije. Dozvola odbijena.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Nepravilan zahtijev! Podaci nisu spremljeni.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nema poruka u sanduﾄ絞ﾄ�u';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 644fca261..3cc5da1aa 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Mﾃ｡solﾃ｡s';
 $labels['move']     = 'ﾃ》helyezﾃｩs';
 $labels['moveto']   = 'ﾃ》helyezﾃｩs...';
 $labels['download'] = 'letﾃｶltﾃｩs';
+$labels['open']     = 'Megnyﾃｭtﾃ｡s';
 $labels['showattachment'] = 'Megjelenﾃｭtﾃｩs';
 $labels['showanyway'] = 'Megjelnitﾃｩs mindenkﾃｩppen';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuﾃ｡lis oldal';
 $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelﾃｶlt';
 $labels['unanswered'] = 'Megvﾃ｡laszolatlan';
+$labels['withattachment'] = 'Csatolmﾃ｡nnyal';
 $labels['deleted'] = 'Tﾃｶrﾃｶlt';
 $labels['undeleted'] = 'Nem lett tﾃｶrﾃｶlve';
 $labels['invert'] = 'Invertﾃ｡lﾃ｡s';
@@ -204,6 +206,8 @@ $labels['body']  = 'Tﾃｶrzs';
 
 $labels['openinextwin'] = 'Megnyitﾃ｡s ﾃｺj ablakban';
 $labels['emlsave'] = 'Letﾃｶltﾃｩs (.eml)';
+$labels['changeformattext'] = 'Megjelenﾃｭtﾃｩs sima szﾃｶveges formﾃ｡tumban';
+$labels['changeformathtml'] = 'Megjelenﾃｭtﾃｩs HTML formﾃ｡tumban';
 
 // message compose
 $labels['editasnew']      = 'Szerkesztﾃｩs ﾃｺjkﾃｩnt';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML ﾃｼzenet ﾃｭrﾃ｡sa';
 $labels['htmlonreply'] = 'csak HTML ﾃｼzenetre vﾃ｡laszolva';
 $labels['htmlonreplyandforward'] = 'HTML ﾃｼzenet tovﾃ｡bbﾃｭtﾃ｡sakor vagy az arra valﾃｳ vﾃ｡laszolﾃ｡skor';
 $labels['htmlsignature'] = 'HTML alﾃ｡ﾃｭrﾃ｡s';
+$labels['showemail'] = 'Az email cﾃｭmek megjelenﾃｭtﾃｩse a partner nevﾃｩvel';
 $labels['previewpane'] = 'Elﾅ創ﾃｩzeti kﾃｩp';
 $labels['skin'] = 'Kinﾃｩzet';
 $labels['logoutclear'] = 'Tﾃｶrﾃｶlt elemek mappa ﾃｼrﾃｭtﾃｩse kilﾃｩpﾃｩskor';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Vﾃ｡lasznﾃ｡l az eredeti alﾃ｡ﾃｭrﾃ｡s eltﾃ｡volﾃｭt
 $labels['autoaddsignature'] = 'Alﾃ｡ﾃｭrﾃ｡s automatikus hozzﾃ｡adﾃ｡sa';
 $labels['newmessageonly'] = 'csak ﾃｺj ﾃｼzenetnﾃｩl';
 $labels['replyandforwardonly'] = 'vﾃ｡lasznﾃ｡l ﾃｩs tovﾃ｡bbﾃｭtﾃ｡snﾃ｡l';
-$labels['replysignaturepos'] = 'Vﾃ｡lasznﾃ｡l ﾃｩs tovﾃ｡bbﾃｭtﾃ｡snﾃ｡l kerﾃｼljﾃｶn az alﾃ｡ﾃｭrﾃ｡s';
-$labels['belowquote'] = 'az idﾃｩzett szﾃｶveg alﾃ｡';
-$labels['abovequote'] = 'az idﾃｩzett szﾃｶveg fﾃｶlﾃｩ';
 $labels['insertsignature'] = 'Alﾃ｡ﾃｭrﾃ｡s beillesztﾃｩse';
 $labels['previewpanemarkread']  = 'Elﾅ創ﾃｩzetben megjelent ﾃｼzenetek megjelﾃｶlﾃｩse olvasottkﾃｩnt';
 $labels['afternseconds']  = '$n mﾃ｡sodperc elteltﾃｩvel';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index ee3e8a9a5..6528602a4 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -17,7 +17,7 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'Hiba tﾃｶrtﾃｩnt';
+$messages['errortitle']  = 'Hiba tﾃｶrtﾃｩnt!';
 $messages['loginfailed']  = 'Sikertelen bejelentkezﾃｩs.';
 $messages['cookiesdisabled'] = 'A bﾃｶngﾃｩszﾅ� nem tﾃ｡mogatja a sﾃｼtik hasznﾃ｡latﾃ｡t';
 $messages['sessionerror'] = 'ﾃ詠vﾃｩnytelen vagy lejﾃ｡rt munkamenet';
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Adatbﾃ｡zishiba!';
 $messages['requesttimedout'] = 'A kﾃｩrﾃｩs tﾃｺllﾃｩpte az idﾅ遡orlﾃ｡tot';
 $messages['errorreadonly'] = 'A mﾅｱveletet nem sikerﾃｼlt vﾃｩgrehajtani. A mappa ﾃｭrﾃ｡svﾃｩdett.';
 $messages['errornoperm'] = 'A mﾅｱveletet nem sikerﾃｼlt vﾃｩgrehajtani. Hozzﾃ｡fﾃｩrﾃｩs megtagadva.';
+$messages['erroroverquota'] = 'A mﾅｱveletet nem lehetett vﾃｩgrehajtani mivel nincs elﾃｩg szabad hely a merevlemezen.';
+$messages['erroroverquotadelete'] = 'Nincs elﾃｩg szabad hely a merevlemezen. A SHIFT+DEL billenytyﾅｱ kombinﾃ｡ciﾃｳt hasznﾃ｡ld az ﾃｼzenet tﾃｶrlﾃｩsﾃｩhez.';
 $messages['invalidrequest'] = 'ﾃ詠vﾃｩnytelen kﾃｩrﾃｩs! Az adatok nem lettek elmentve.';
 $messages['invalidhost'] = 'Hibﾃ｡s szerver hoszt nﾃｩv';
 $messages['nomessagesfound'] = 'A fiﾃｳk nem tartalmaz leveleket';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 490604cc5..99cee4ab9 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Cc';
 $labels['move']     = 'ﾕ衝･ﾕｲﾕ｡ﾖψｸﾕｭﾕ･ﾕｬ';
 $labels['moveto']   = 'ﾕ衝･ﾕｲﾕ｡ﾖψｸﾕｭﾕ･ﾕｬ...';
 $labels['download'] = 'ﾕ盤｡ﾕｷﾕ･ﾕｬ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾔｱﾕｼﾕｯﾕ｡ ﾕｧﾕｻ';
 $labels['unread'] = 'ﾕ苛ｯﾕ｡ﾖ�ﾕ､ﾕ｡ﾖ�ﾕ｡ﾕｮﾕｨ';
 $labels['flagged'] = 'ﾕ�ﾕｷﾕｾﾕ｡ﾕｮ';
 $labels['unanswered'] = 'ﾔｱﾕｶﾕｺﾕ｡ﾕｿﾕ｡ﾕｽﾕｭﾕ｡ﾕｶ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾕ琴ｶﾕｻﾕｾﾕ｡ﾕｮ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'ﾕ惇ｸﾕｭﾕ｡ﾕｿﾕ･ﾕｲﾕ･ﾕｬ';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'ﾔｲﾕ｡ﾖ�ﾕ･ﾕｬ ﾕｶﾕｸﾖ� ﾕｺﾕ｡ﾕｿﾕｸﾖぷｰﾕ｡ﾕｶﾕｸﾖぷｴ';
 $labels['emlsave'] = 'ﾕ�ﾕ･ﾖ�ﾕ｢ﾕ･ﾕｼﾕｶﾕ･ﾕｬ (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'ﾔｽﾕｴﾕ｢ﾕ｡ﾕ｣ﾖ�ﾕ･ﾕｬ ﾕｸﾖ�ﾕｺﾕ･ﾕｽ ﾕｶﾕｸﾖ�';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾕ祭ｿﾕ･ﾕｲﾕｮﾕ･ﾕｬ HTML ﾕｶﾕ｡ﾕｴﾕ｡ﾕｯﾕｶﾕ･ﾖ�';
 $labels['htmlonreply'] = 'ﾕｴﾕｫﾕ｡ﾕｵﾕｶ HTML ﾕｰﾕ｡ﾕｲﾕｸﾖ�ﾕ､ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕ｡ﾕｶﾕｨ ﾕｺﾕ｡ﾕｿﾕ｡ﾕｽﾕｭﾕ｡ﾕｶﾕ･ﾕｬﾕｫﾕｽ';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ﾕｽﾕｿﾕｸﾖ�ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕｸﾖぷｶ';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾕ戴ｸﾖへ�ﾕ｡ﾕ､ﾖ�ﾕ･ﾕｬ ﾕｺﾕ｡ﾕｿﾕｸﾖぷｰﾕ｡ﾕｶﾕｨ';
 $labels['skin'] = 'ﾕ衝･ﾕｽﾖ�ﾕｫ ﾕｿﾕ｡ﾖ�ﾕ｢ﾕ･ﾖ�ﾕ｡ﾕｯ';
 $labels['logoutclear'] = 'ﾔｴﾕｸﾖへ�ﾕｽ ﾕ｣ﾕ｡ﾕｬﾕｸﾖへ� ﾕ､ﾕ｡ﾕｿﾕ｡ﾖ�ﾕｯﾕ･ﾕｬ ﾕ｡ﾕｲﾕ｢ﾕ｡ﾖ�ﾕｯﾕｲﾕｨ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾕ閑｡ﾕｿﾕ｡ﾕｽﾕｭﾕ｡ﾕｶﾕ･ﾕｬﾕｫﾕｽ ﾕｰﾕ･ﾕｼﾕ｡ﾖ�ﾕｶﾕ･ﾕｬ ﾕｰﾕ
 $labels['autoaddsignature'] = 'ﾔｱﾕｾﾕ･ﾕｬﾕ｡ﾖ�ﾕｶﾕ･ﾕｬ ﾕｽﾕｿﾕｸﾖ�ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕｸﾖぷｶ';
 $labels['newmessageonly'] = 'ﾕｴﾕｫﾕ｡ﾕｵﾕｶ ﾕｶﾕｸﾖ� ﾕｰﾕ｡ﾕｲﾕｸﾖ�ﾕ､ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕｸﾖぷｶﾕｶﾕ･ﾖ�ﾕｸﾖぷｴ';
 $labels['replyandforwardonly'] = 'ﾕｺﾕ｡ﾕｿﾕ｡ﾕｽﾕｭﾕ｡ﾕｶﾕｶﾕ･ﾖ�ﾕｸﾖぷｴ ﾖ� ﾖψｸﾕｭﾕ｡ﾕｶﾖ�ﾕｸﾖぷｴﾕｶﾕ･ﾖ�ﾕｸﾖぷｴ';
-$labels['replysignaturepos'] = 'ﾔｱﾕｾﾕ･ﾕｬﾕ｡ﾖ�ﾕｶﾕ･ﾕｬ ﾕｽﾕｿﾕｸﾖ�ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕｸﾖぷｶﾕｨ ﾕｺﾕ｡ﾕｿﾕ｡ﾕｽﾕｭﾕ｡ﾕｶﾕ･ﾕｬﾕｫﾕｽ ﾕｯﾕ｡ﾕｴ ﾖψｸﾕｭﾕ｡ﾕｶﾖ�ﾕ･ﾕｬﾕｫﾕｽ';
-$labels['belowquote'] = 'ﾕ�ﾕ･ﾕｻﾕ｢ﾕ･ﾖ�ﾕｴﾕ｡ﾕｶ ﾕｶﾕ･ﾖ�ﾖ�ﾖ�ﾕｸﾖぷｴ';
-$labels['abovequote'] = 'ﾕ�ﾕ･ﾕｻﾕ｢ﾕ･ﾖ�ﾕｴﾕ｡ﾕｶ ﾕｾﾕ･ﾖ�ﾖ�ﾕｸﾖぷｴ';
 $labels['insertsignature'] = 'ﾕ�ﾕ･ﾖ�ﾕ､ﾕｶﾕ･ﾕｬ ﾕｽﾕｿﾕｸﾖ�ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕｸﾖぷｶﾕｨ';
 $labels['previewpanemarkread']  = 'ﾕ�ﾕｷﾕ･ﾕｬ ﾕｶﾕ｡ﾕｭﾕ｡ﾕ､ﾕｫﾕｿﾕｾﾕ｡ﾕｮ ﾕｰﾕ｡ﾕｲﾕｸﾖ�ﾕ､ﾕ｡ﾕ｣ﾖ�ﾕｸﾖぷｩﾕｵﾕｸﾖぷｶﾕｶﾕ･ﾖ�ﾕｨ ﾕｸﾖ�ﾕｺﾕ･ﾕｽ ﾕｨﾕｶﾕｩﾕ･ﾖ�ﾖ�ﾕｾﾕ｡ﾕｮ';
 $labels['afternseconds']  = '$n ﾕｾﾕ｡ﾖ�ﾕｯﾕｵﾕ｡ﾕｶ ﾕｰﾕ･ﾕｿﾕｸ';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index bbb083a21..6b3f4ebe9 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾕ衝ｾﾕｵﾕ｡ﾕｬﾕｶﾕ･ﾖ�ﾕｫ ﾕｷﾕｿﾕ･ﾕｴﾕ｡ﾖ�ﾕ｡ﾕｶﾕｫ ﾕｽﾕｭﾕ｡ﾕ嶐ｬ';
 $messages['requesttimedout'] = 'ﾕ�ﾕ｡ﾖ�ﾖ�ﾕｴﾕ｡ﾕｶ ﾕｩﾕｸﾖぷｵﾕｬﾕ｡ﾕｿﾖ�ﾕ･ﾕｬﾕｫ ﾕｪﾕ｡ﾕｴﾕ｡ﾕｶﾕ｡ﾕｯﾕｨ ﾕｽﾕｺﾕ｡ﾕｼﾕｾﾕ･ﾖ�';
 $messages['errorreadonly'] = 'ﾔｳﾕｸﾖ�ﾕｮﾕｸﾕｲﾕｸﾖぷｩﾕｵﾕｸﾖぷｶﾕｨ ﾕ｡ﾕｶﾕｰﾕｶﾕ｡ﾖ� ﾕｧﾖ� ﾕ閑｡ﾕｶﾕ｡ﾕｯﾕｨ ﾕｴﾕｫﾕ｡ﾕｵﾕｶ ﾕｨﾕｶﾕｩﾕ･ﾖ�ﾖ�ﾕｴﾕ｡ﾕｶ ﾕｰﾕ｡ﾕｴﾕ｡ﾖ� ﾕｧﾖ�';
 $messages['errornoperm'] = 'ﾔｳﾕｸﾖ�ﾕｮﾕｸﾕｲﾕｸﾖぷｩﾕｵﾕ｡ﾕｶ ﾕｯﾕ｡ﾕｿﾕ｡ﾖ�ﾕｴﾕ｡ﾕｶ ﾕｫﾖ�ﾕ｡ﾕｾﾕｸﾖぷｶﾖ�ﾕｨ ﾕｴﾕ･ﾖ�ﾕｪﾕｾﾕ｡ﾕｮ ﾕｧﾖ�';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'ﾕ祭ｭﾕ｡ﾕｬ ﾕｰﾕ｡ﾖ�ﾖ�ﾕｸﾖぷｴ, ﾕ｡ﾕｺﾕ｡ﾖ�ﾕ､ﾕｵﾕｸﾖぷｶﾖ�';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ﾔｱﾕｵﾕｽ ﾖψｸﾕｽﾕｿﾕ｡ﾖ�ﾕｯﾕｲﾕｸﾖぷｴ ﾕｶﾕ｡ﾕｴﾕ｡ﾕｯﾕｶﾕ･ﾖ� ﾕｹﾕｯﾕ｡ﾕｶ';
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index fcf5634ff..2a9501168 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a';
 $labels['download'] = 'Discargar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Monstrar';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Non legite';
 $labels['flagged'] = 'Marcate';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Delete';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Aperir in nove fenestra';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Modificar como nove';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Signatura HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Apparentia de interfacie';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automaticamente inserta signatura';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insertar signatura';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ia/messages.inc b/program/localization/ia/messages.inc
index fca8404b2..ebc6953d2 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Error de base de datos!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 13c34bef6..eea3132cd 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Salin';
 $labels['move']     = 'Pindahkan';
 $labels['moveto']   = 'Pindahkan ke...';
 $labels['download'] = 'Unduh';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Tampilkan';
 $labels['showanyway'] = 'Tampilkan saja';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Halaman sekarang';
 $labels['unread'] = 'Belum terbaca';
 $labels['flagged'] = 'Ditandai';
 $labels['unanswered'] = 'Belum terjawab';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Terhapus';
 $labels['undeleted'] = 'Tidak terhapus';
 $labels['invert'] = 'Sebaliknya';
@@ -204,6 +206,8 @@ $labels['body']  = 'Badan';
 
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Sunting sebagai pesan baru';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Tulis pesan HTML';
 $labels['htmlonreply'] = 'balasan untuk pesan HTML saja';
 $labels['htmlonreplyandforward'] = 'ketika meneruskan atau membalas pesan HTML';
 $labels['htmlsignature'] = 'Tandatangan HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Unjuk pratinjau';
 $labels['skin'] = 'Tampilan antarmuka';
 $labels['logoutclear'] = 'Bersihkan Tong Sampah saat keluar';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ketika membalas pesan hapus tanda tangan dari
 $labels['autoaddsignature'] = 'Otomatis tambahkan tanda tangan';
 $labels['newmessageonly'] = 'Hanya untuk pesan baru';
 $labels['replyandforwardonly'] = 'Hanya untuk dijawab dan diteruskan';
-$labels['replysignaturepos'] = 'ketika membalas atau meneruskan pesan tambahkan tanda tangan';
-$labels['belowquote'] = 'Dibawah kutipan';
-$labels['abovequote'] = 'Diatas kutipan';
 $labels['insertsignature'] = 'Isi tanda tangan';
 $labels['previewpanemarkread']  = 'Tandai pesan yang sudah dilihat';
 $labels['afternseconds']  = 'setelah $n detik';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index b604d0242..04d8242ad 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Basis data Error!';
 $messages['requesttimedout'] = 'Permintaan melewati batas waktu';
 $messages['errorreadonly'] = 'Tidak bisa melakukan operasi. Folder hanya bisa dibaca.';
 $messages['errornoperm'] = 'Tidak bisa melakukan operasi. Ijin ditolak.';
+$messages['erroroverquota'] = 'Tidak dapat melakukan operasi. Disk penuh.';
+$messages['erroroverquotadelete'] = 'Disk penuh. Tekan SHIFT + DEL untuk menghapus pesan';
 $messages['invalidrequest'] = 'Permintaan tidak valid! Tidak ada data yang tersimpan.';
 $messages['invalidhost'] = 'Nama server invalid.';
 $messages['nomessagesfound'] = 'Surat tidak ditemukan di kotak masuk ini';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index 33dc7b6d2..80443dd3a 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Afrit';
 $labels['move']     = 'Fﾃｦra';
 $labels['moveto']   = 'Fﾃｦra ﾃｭ...';
 $labels['download'] = 'Hlaﾃｰa niﾃｰur';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Nﾃｺverandi sﾃｭﾃｰa';
 $labels['unread'] = 'ﾃ斗esiﾃｰ';
 $labels['flagged'] = 'Flaggaﾃｰ';
 $labels['unanswered'] = 'ﾃ都varaﾃｰ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eytt';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Umhverfa';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Opna ﾃｭ nﾃｽjum glugga';
 $labels['emlsave'] = 'Niﾃｰurhlaﾃｰa (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Breyta sem nﾃｽju';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Skrifa HTML-skeyti';
 $labels['htmlonreply'] = 'sem svar viﾃｰ HTML-skeytum aﾃｰeins';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML-undirskrift';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Sﾃｽna forskoﾃｰunarglugga';
 $labels['skin'] = 'Sniﾃｰmﾃ｡t ﾃ｡ viﾃｰmﾃｳti';
 $labels['logoutclear'] = 'Tﾃｦma rusl viﾃｰ ﾃｺtskrﾃ｡ningu';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾃ枡gar svaraﾃｰ fjarlﾃｦgja upphaflega undirskr
 $labels['autoaddsignature'] = 'Bﾃｦta undirskrift viﾃｰ sjﾃ｡lfkrafa';
 $labels['newmessageonly'] = 'nﾃｽ skeyti eingﾃｶngu';
 $labels['replyandforwardonly'] = 'svﾃｶr og ﾃ｡framsendingar eingﾃｶngu';
-$labels['replysignaturepos'] = 'ﾃ枡gar skeytum er svaraﾃｰ eﾃｰa ﾃ｡framsend setja undirskrift';
-$labels['belowquote'] = 'undir tilvitnun';
-$labels['abovequote'] = 'fyrir ofan tilvitnun';
 $labels['insertsignature'] = 'Bﾃｦta undirskrift viﾃｰ';
 $labels['previewpanemarkread']  = 'Merka forskoﾃｰuﾃｰ skeyti sem lesin';
 $labels['afternseconds']  = 'eftir $n sekﾃｺndur';
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index 530e8008f..6e9f35af3 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Engin skeyti eru ﾃｭ ﾃｾessu pﾃｳsthﾃｳlfi';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 2f8442f18..75a24c5fd 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Sposta';
 $labels['moveto']   = 'Sposta in...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Apri';
 $labels['showattachment'] = 'Visualizza';
 $labels['showanyway'] = 'Visualizza comunque';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pagina corrente';
 $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnato';
 $labels['unanswered'] = 'Senza risposta';
+$labels['withattachment'] = 'Con allegato';
 $labels['deleted'] = 'Cancellato';
 $labels['undeleted'] = 'Non eliminato';
 $labels['invert'] = 'Inverti';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
+$labels['changeformattext'] = 'Visualizza nel formato testo semplice';
+$labels['changeformathtml'] = 'Visualizza nel formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Modifica come nuovo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Scrivi i messaggi in HTML';
 $labels['htmlonreply'] = 'solo in risposta a messaggi HTML';
 $labels['htmlonreplyandforward'] = 'su inoltro o risposta a messaggi HTML';
 $labels['htmlsignature'] = 'Firma in HTML';
+$labels['showemail'] = 'Visualizza indirizzi email con il nome visualizzato';
 $labels['previewpane'] = 'Mostra l\'anteprima';
 $labels['skin'] = 'Tema interfaccia';
 $labels['logoutclear'] = 'Svuota il Cestino all\'uscita';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Quando rispondi, rimuovi la firma dal messagg
 $labels['autoaddsignature'] = 'Aggiungi automaticamente la firma';
 $labels['newmessageonly'] = 'solo ai nuovi messaggi';
 $labels['replyandforwardonly'] = 'solo alle risposte e inoltri';
-$labels['replysignaturepos'] = 'In risposta o inoltro, posiziona la firma';
-$labels['belowquote'] = 'sotto la citazione';
-$labels['abovequote'] = 'sopra la citazione';
 $labels['insertsignature'] = 'Inserisci firma';
 $labels['previewpanemarkread']  = 'Segna i messagi in anteprima come letti';
 $labels['afternseconds']  = 'dopo $n secondi';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 66c248e74..80395b551 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Errore del database!';
 $messages['requesttimedout'] = 'Richiesta scaduta';
 $messages['errorreadonly'] = 'Impossibile eseguire l\'operazione. Cartella in sola lettura';
 $messages['errornoperm'] = 'Impossibile eseguire l\'operazione. Permesso negato';
+$messages['erroroverquota'] = 'Impossibile eseguire l\'operazione. Spazio su disco non sufficiente.';
+$messages['erroroverquotadelete'] = 'Spazio su disco non sufficiente. Utilizza SHIFT+CANC per eliminare un messaggio.';
 $messages['invalidrequest'] = 'Richiesta non valida! Nessun dato salvato.';
 $messages['invalidhost'] = 'Nome del server non valido.';
 $messages['nomessagesfound'] = 'Nessun messaggio trovato in questa cartella';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 46f6fad28..6998f0623 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '繧ｳ繝斐�ｼ';
 $labels['move']     = '遘ｻ蜍�';
 $labels['moveto']   = '繝輔か繝ｫ繝�繝ｼ縺ｫ遘ｻ蜍�';
 $labels['download'] = '繝�繧ｦ繝ｳ繝ｭ繝ｼ繝�';
+$labels['open']     = '髢九￥';
 $labels['showattachment'] = '陦ｨ遉ｺ';
 $labels['showanyway'] = '縺ｨ縺ｫ縺九￥陦ｨ遉ｺ';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '迴ｾ蝨ｨ縺ｮ繝壹�ｼ繧ｸ';
 $labels['unread'] = '譛ｪ隱ｭ';
 $labels['flagged'] = '繝輔Λ繧ｰ莉倥″';
 $labels['unanswered'] = '譛ｪ霑比ｿ｡';
+$labels['withattachment'] = '豺ｻ莉倥ヵ繧｡繧､繝ｫ縺ゅｊ';
 $labels['deleted'] = '蜑企勁貂医∩';
 $labels['undeleted'] = '蜑企勁貂医∩縺ｧ縺ｪ縺�';
 $labels['invert'] = '蜿崎ｻ｢';
@@ -204,6 +206,8 @@ $labels['body']  = '譛ｬ譁�';
 
 $labels['openinextwin'] = '譁ｰ縺励＞繧ｦ繧｣繝ｳ繝峨え縺ｧ髢九￥';
 $labels['emlsave'] = '繝�繧ｦ繝ｳ繝ｭ繝ｼ繝�(.eml蠖｢蠑�)';
+$labels['changeformattext'] = '繝�繧ｭ繧ｹ繝亥ｽ｢蠑上〒陦ｨ遉ｺ';
+$labels['changeformathtml'] = 'HTML蠖｢蠑上〒陦ｨ遉ｺ';
 
 // message compose
 $labels['editasnew']      = '譁ｰ縺励＞繝｡繝�繧ｻ繝ｼ繧ｸ縺ｨ縺励※邱ｨ髮�';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '菴懈�先凾縺ｫHTML繝｡繝�繧ｻ繝ｼ繧ｸ繧剃ｽｿ逕ｨ';
 $labels['htmlonreply'] = '霑比ｿ｡譎ゅ↓HTML繝｡繝�繧ｻ繝ｼ繧ｸ繧剃ｽｿ逕ｨ';
 $labels['htmlonreplyandforward'] = '霆｢騾√∪縺溘�ｯHTML繝｡繝�繧ｻ繝ｼ繧ｸ縺ｸ縺ｮ霑比ｿ｡';
 $labels['htmlsignature'] = 'HTML縺ｮ鄂ｲ蜷�';
+$labels['showemail'] = '髮ｻ蟄舌Γ繝ｼ繝ｫ繧｢繝峨Ξ繧ｹ繧定｡ｨ遉ｺ蜷阪→蜈ｱ縺ｫ陦ｨ遉ｺ';
 $labels['previewpane'] = '繝励Ξ繝薙Η繝ｼ譫�縺ｮ陦ｨ遉ｺ';
 $labels['skin'] = '繧､繝ｳ繧ｿ繝ｼ繝輔ぉ繧､繧ｹ縺ｮ繧ｹ繧ｭ繝ｳ';
 $labels['logoutclear'] = '繝ｭ繧ｰ繧｢繧ｦ繝域凾縺ｫ縺斐∩邂ｱ縺ｮ蜀�螳ｹ繧呈ｶ亥悉';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '霑比ｿ｡譎ゅ↓蜈�縺ｮ鄂ｲ蜷阪ｒ繝｡繝�繧ｻ繝ｼ繧ｸ縺�
 $labels['autoaddsignature'] = '閾ｪ蜍慕噪縺ｫ鄂ｲ蜷阪ｒ莉伜刈';
 $labels['newmessageonly'] = '譁ｰ縺励＞繝｡繝�繧ｻ繝ｼ繧ｸ縺�縺�';
 $labels['replyandforwardonly'] = '霑比ｿ｡縺ｨ霆｢騾√□縺�';
-$labels['replysignaturepos'] = '霑比ｿ｡繧�霆｢騾√〒鄂ｲ蜷阪ｒ謖ｿ蜈･縺吶ｋ菴咲ｽｮ';
-$labels['belowquote'] = '蠑慕畑縺ｮ蠕�';
-$labels['abovequote'] = '蠑慕畑縺ｮ蜑�';
 $labels['insertsignature'] = '鄂ｲ蜷阪ｒ謖ｿ蜈･';
 $labels['previewpanemarkread']  = '繝励Ξ繝薙Η繝ｼ縺励◆繝｡繝�繧ｻ繝ｼ繧ｸ繧呈里隱ｭ縺ｫ險ｭ螳�';
 $labels['afternseconds']  = '$n遘貞ｾ�';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 6c6008a55..f4dd0fceb 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '繝�繝ｼ繧ｿ繝吶�ｼ繧ｹ縺ｮ繧ｨ繝ｩ繝ｼ縺ｧ縺�!';
 $messages['requesttimedout'] = '繝ｪ繧ｯ繧ｨ繧ｹ繝医�ｮ繧ｿ繧､繝�繧｢繧ｦ繝�';
 $messages['errorreadonly'] = '謫堺ｽ懊ｒ螳溯｡後〒縺阪∪縺帙ｓ縺ｧ縺励◆縲ゅヵ繧ｩ繝ｫ繝�繝ｼ縺ｯ隱ｭ縺ｿ霎ｼ縺ｿ蟆ら畑縺ｧ縺吶��';
 $messages['errornoperm'] = '謫堺ｽ懊ｒ螳溯｡後〒縺阪∪縺帙ｓ縺ｧ縺励◆縲よｨｩ髯舌′縺ゅｊ縺ｾ縺帙ｓ縲�';
+$messages['erroroverquota'] = '謫堺ｽ懊ｒ螳溯｡後〒縺阪∪縺帙ｓ縺ｧ縺励◆縲らｩｺ縺阪ョ繧｣繧ｹ繧ｯ螳ｹ驥上′縺ゅｊ縺ｾ縺帙ｓ縲�';
+$messages['erroroverquotadelete'] = '遨ｺ縺阪ョ繧｣繧ｹ繧ｯ螳ｹ驥上′縺ゅｊ縺ｾ縺帙ｓ縲ゅΓ繝�繧ｻ繝ｼ繧ｸ繧貞炎髯､縺吶ｋ縺ｫ縺ｯ SHIFT+DEL 繧剃ｽｿ逕ｨ縺励※縺上□縺輔＞縲�';
 $messages['invalidrequest'] = '荳肴ｭ｣縺ｪ繝ｪ繧ｯ繧ｨ繧ｹ繝医〒縺�!  繝�繝ｼ繧ｿ縺ｯ菫晏ｭ倥＠縺ｦ縺�縺ｾ縺帙ｓ縲�';
 $messages['invalidhost'] = '豁｣縺励￥縺ｪ縺�繧ｵ繝ｼ繝舌�ｼ蜷阪〒縺吶��';
 $messages['nomessagesfound'] = '縺薙�ｮ繝輔か繝ｫ繝�繝ｼ縺ｫ縺ｯ繝｡繝�繧ｻ繝ｼ繧ｸ縺ｯ縺ゅｊ縺ｾ縺帙ｓ縲�';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 9b06db839..3ab3b6e63 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '痺雪Γ痺壯��';
 $labels['move']     = '痺低ヰ痺乍ヰ痺｢痺雪�憮ヰ';
 $labels['moveto']   = '痺低ヰ痺乍ヰ痺｢痺雪�憮ヰ...';
 $labels['download'] = '痺低ヰ痺乍�帋�昵Ξ痺批Β痺�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '痺帋�倔�帋ン痺倔�憮ヰ痺�痺� 痺低ヵ痺批Β痺乍��';
 $labels['unread'] = '痺ｬ痺雪Ε痺吼�倔�例Π痺雪ヵ痺�';
 $labels['flagged'] = '痺帋�昵�憮�倔Κ痺憮Ε痺壯��';
 $labels['unanswered'] = '痺｣痺榱ヰ痺｡痺｣痺ｮ痺�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '痺ｬ痺雪Κ痺壯�倔�壯��';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = '痺ｨ痺批ヱ痺�痺｣痺憮ヴ痺黛Ε痺壯��';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = '痺低ヰ痺ｮ痺｡痺憮ヰ 痺雪Π痺雪�� 痺､痺雪�憮Ρ痺雪Β痺雪Κ痺�';
 $labels['emlsave'] = '痺低ヰ痺乍�帋�昵Ξ痺批Β痺� (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '痺�痺批ン痺雪Η痺｢痺倔Β痺批ヱ痺� 痺�痺昵ヲ痺昵Β痺ｪ 痺雪Π痺壯�倔Γ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '痺ｨ痺批Δ痺ｧ痺昵ヱ痺倔�憮ヴ痺黛�倔Γ 痺ｨ痺批Η痺帋�憮ヰ
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML 痺ｮ痺批�壯�帋�昵Ξ痺批Β痺�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '痺ｩ痺甫ヴ痺憮ヴ痺黛ヰ';
 $labels['skin'] = '痺倔�憮Δ痺批Β痺､痺批�倔Γ痺�';
 $labels['logoutclear'] = '痺ｬ痺雪Κ痺壯�倔�壯ヴ痺黛�倔Γ 痺低ヰ痺｡痺｣痺､痺例ヰ痺甫ヴ痺黛ヰ 痺低ヰ痺帋�昵Γ痺甫�壯�倔Γ痺雪Γ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '痺ｬ痺雪�倔Κ痺雪�壯�昵Γ 痺ｮ痺批�壯�帋�昵Ξ痺
 $labels['autoaddsignature'] = '痺雪ヵ痺｢痺昵�帋ヰ痺｢痺｣痺�痺雪ン 痺乍ヰ痺批�帋ヰ痺｢痺昵Γ 痺ｮ痺批�壯�帋�昵Ξ痺批Β痺�';
 $labels['newmessageonly'] = '痺帋Π痺昵�壯�昵ン 痺雪Π痺雪�壯�� 痺ｨ痺批Δ痺ｧ痺昵ヱ痺倔�憮ヴ痺黛ヰ';
 $labels['replyandforwardonly'] = '痺帋Π痺昵�壯�昵ン 痺低ヰ痺乍ヰ痺低ヶ痺雪ヵ痺憮�倔Γ 痺乍ヰ 痺榱ヰ痺｡痺｣痺ｮ痺倔Γ 痺ｨ痺批�帋�例Π痺甫ヴ痺甫ヰ痺ｨ痺�';
-$labels['replysignaturepos'] = '痺帋Π痺昵�壯�昵ン 痺榱ヰ痺｡痺｣痺ｮ痺倔Γ 痺雪�� 痺低ヰ痺乍ヰ痺低ヶ痺雪ヵ痺憮�倔Γ 痺ｨ痺批�帋�例Π痺甫ヴ痺甫ヰ痺ｨ痺� 痺低ヰ痺ｧ痺甫ヴ痺｡ 痺ｮ痺批�壯�帋�昵Ξ痺批Β痺�';
-$labels['belowquote'] = '痺ｪ痺倔Δ痺雪Δ痺倔Γ 痺ｨ痺批�帋ン痺批ヲ';
-$labels['abovequote'] = '痺ｪ痺倔Δ痺雪Δ痺雪�帋ン痺�';
 $labels['insertsignature'] = '痺ｮ痺批�壯�帋�昵Μ痺批Β痺倔Γ 痺ｩ痺雪Γ痺帋ヰ';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n 痺ｬ痺雪�帋�倔Γ 痺ｨ痺批�帋ン痺批ヲ';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 7ad0b665b..754343fac 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '痺帋�昵�憮ヰ痺ｪ痺批�帋�例ヰ 痺黛ヰ痺貰�倔Γ 痺ｨ痺批Μ痺�
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = '痺帋�昵Η痺帋ヴ痺乍ヴ痺黛�倔Γ 痺ｨ痺批Γ痺�痺｣痺壯ヴ痺黛ヰ 痺ｨ痺批Ε痺ｫ痺壯ヴ痺黛ヰ痺壯�倔ヰ. 痺ｬ痺甫ン痺昵�帋ヰ 痺雪�吼Β痺ｫ痺雪�壯Ε痺壯�倔ヰ.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = '痺雪Β痺雪Γ痺ｬ痺昵Β痺� 痺帋�昵�例Π痺昵ヵ痺憮ヰ! 痺帋�昵�憮ヰ痺ｪ痺批�帋ヴ痺黛�倔Γ 痺ｨ痺批�憮ヰ痺ｮ痺甫ヰ 痺雪Β 痺帋�昵Π痺批Β痺ｮ痺乍ヰ.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '痺雪Β 痺雪Β痺倔Γ 痺雪Π痺雪�壯�� 痺ｨ痺批Δ痺ｧ痺昵ヱ痺倔�憮ヴ痺黛ヰ';
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 0f7d85dd8..7b10b5f7f 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '癰�癲�癰帋桷';
 $labels['move']     = '癰甫汳癰黛氈癰�';
 $labels['moveto']   = '癰甫汳癰黛氈癰壯梠癲�';
 $labels['download'] = '癰黛楔癰蚊棘癰�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '癰黛氣癰貰汾癰壯椏癲≪汞';
 $labels['unread'] = '癰倔楾癰乍梠癰ｶ癰乍沂癰｢癰ｶ癰�';
 $labels['flagged'] = '癰倔楔癰乍梳癲�癰若桴癲吟棔癲�癰ゃ楔癰帋沂癰眼氛癰吼桾癲低梳癰ｶ癰�';
 $labels['unanswered'] = '癰倔楾癰乍梠癰ｶ癰乍沂癰�癲低椦癰ｾ癰吼桴癰�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '癰批楔癰乍椦癰ｻ癰批椢癰ｽ癰�';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = '癰批梔癲低桿癲低椢癰溂沂';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = '癰批楡癰�癰�癲低椏癰ｻ癰�癰憮楮癰乍條癰ｼ癰憮梵癲低椈癰ｸ';
 $labels['emlsave'] = '癰壯梳癲低棔癰ｶ癰黛椽癰�癰黛楾癰乍汳癰乍椏癲雪棘癰�癰ｶ癰ｯ癰�癰溂楔癰壯梍癲低椢癰例氈癰�(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '癰�癲ゃ棧癰ｾ癰吼椢癰�癲低棔癰ｶ癰黛椽癰�癰眼楙癰�癰�癰ｶ癰溂氣癰批椽癰障汳癰壯梵癲低椈癰ｸ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '癰溂椢癰溂氈癰壯棔癲�癰批椽癰障汳癰壯桴癰ｶ癰倔梍癲ゃ梍
 $labels['htmlonreply'] = '癰�癲低椦癰ｾ癰吼桴癰批棔癲�癰批椽癰障汳癰壯桴癰ｶ癰倔梍癲ゃ梍 HTML';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '癰�癰障汳癰雪椦癲≪栫癰ｶ癰障楔癰倔梍癲ゃ梍 HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '癰批桷癲低棧癰ｶ癰蚊梍癲低椢癰｢癰批沂癰溂氣癰壯楔癰批沂癰倔楡癰帋棔癲�癰批椽癰障汳癰�';
 $labels['skin'] = '癰�癰ｶ癰壯椢癰�癰乍楔癰黛氣癰貰汾癰�';
 $labels['logoutclear'] = '癰溂氣癰｢癰ｶ癰障梺癰ｻ癰�癰溂氣癰壯楔癰倔椁癲≪椦癰貰楾癰乍楾癰障汳癰吼桿癲≪梔';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '癰乍氤窶吟椁癲≪椦窶吟梟癲低椦癰ｾ癰吮�吟桴癰�
 $labels['autoaddsignature'] = '癰批梔癲低桿癰ｼ癰帋棧癰障汳癰障椦癲≪栫癰ｶ癰眼氛癰吼棔癲低棡癲雪棘癰批汳癰壯棡癰障汳癰障楾';
 $labels['newmessageonly'] = '癰溂氣癰壯楔癰批沂癰溂氣癰批椽癰障汳癰壯梵癲低椈癰ｸ癰障氓癰批汢癰ｻ癰若汳癰若氛癲�';
 $labels['replyandforwardonly'] = '癰溂氣癰壯楔癰批沂癰�癰ｾ癲低椦癰吼桴癰披�吟椏癰ｷ癰�癰甫汳癰蚊楡癰批椏癲低桴癰障氓窶吟梍癲蚊椽癰若汳癰若氛癲�';
-$labels['replysignaturepos'] = '癰批梔癲低桿癰ｼ癰帋棧癰障汳癰障椦癲≪栫癰ｶ癰乍氤癰貰氈癰帋梟癰ｾ癲低椦癰吼桴癰披�吟椏癰ｷ癰�癰甫汳癰蚊楡癰批椏癲低桴';
-$labels['belowquote'] = '癰貰楮癰�癲低椢癲�癰倔棔癰倔汳癰壯桷癲吟椶癰障汳癰雪梍癰�';
-$labels['abovequote'] = '癰貰楮癰帋楡癰溂椈癲低椢癰�癲吟椶癰障汳癰雪梍癰�';
 $labels['insertsignature'] = '癰批梔癲低桿癰ｼ癰帋棧癰障汳癰障椦癲≪栫癰ｶ';
 $labels['previewpanemarkread']  = '癰�癲�癰若桴癲吟棔癲�癰批椽癰障汳癰壺�吟條癲ゃ椦窶吟梍癰ｶ癰凪�吟梍癰�癲低棧癰ｶ癰俄�銀�吟梏癰ｶ窶吟棔癲�癰批椽癰障汳癰壯梍癰ｶ癰凪�吟椶癰ｶ癰凪�吟椢癰ｽ癰�';
 $labels['afternseconds']  = '癰�癲低椢癲�癰吼椁癰ｸ $n 癰憮楾癰乍楔癰黛楮';
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index c9ede486e..1f629fa6c 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = '癰倔楾癰乍椶癰ｶ癰�癰批汳癰壯桴癰ｷ癰批桴癲低桴癰ｷ癰批楔癰乍椁癰ｸ癰貰汳癰壯氛癲�癰雪桴癰乍氈癲�癰障汳癰壯楙癰憮梍癰ｶ癰乍桙癲≪梳癲�癰若桴癲吟棔癲�癰壯楔癰批沂癰障氓癰倔楡癰�';
 $messages['errornoperm'] = '癰倔楾癰乍椶癰ｶ癰�癰批汳癰壯桴癰ｷ癰批桴癲低桴癰ｷ癰批楔癰乍椁癰ｸ癰貰汳癰壯氛癲�癰倔楾癰乍椈癰ｶ癰乍棔癰ｷ癰黛汳癰黛桙癲低椢癰批沂癰ゃ汳癰壯楔癰乍沂';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = '癰倔楾癰乍椶癰ｶ癰�癰壯梳癲低棔癰ｶ癰黛椽癰�癰黛楾癰乍汳癰乍椏癲雪棘癰批楔癰乍椁癰ｸ癰貰汳癰壯氛癲�癰倔楔癰乍梍癰蚊汳癰�癰ｶ癰乍氤癰貰氈癰帋梍癰蚊汳癰�癰ｼ癰乍梠癰ｷ癰乍汳癰乍椏癲雪棘';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '癰貰椽癲�癰倔楔癰乍棔癲�癰批椽癰障汳癰壯梳癲低椏癰ｻ癰�癰批汳癰壯椶癰批沂癰溂氣癰批椽癰障汳癰壯椏癲≪汞癰黛氈';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 1d17cdd94..950928767 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -21,53 +21,54 @@ $labels = array();
 // login page
 $labels['welcome']   = '$product�乱 �丶�侠 �ｲ��揆 �劍����鮒�笈�共';
 $labels['username']  = '�ぎ�圸�梵�ｪ�';
-$labels['password']  = '�ｹ��ｰ��ｲ逸从';
+$labels['password']  = '�部�从';
 $labels['server']    = '��罹ｲ�';
 $labels['login']     = '�｡懋ｷｸ�攤';
 
 // taskbar
 $labels['logout']   = '�｡懋ｷｸ�符�寃';
-$labels['mail']     = '�擽�ｩ肥攵';
-$labels['settings'] = '�ｰ懍攤 �└���';
+$labels['mail']     = '�ｩ肥攵';
+$labels['settings'] = '�└���';
 $labels['addressbook'] = '�｣ｼ��誤｡�';
 
 // mailbox names
-$labels['inbox']  = '�ｰ幗捩�失�ｧ��物';
-$labels['drafts'] = '�桷�亨����棗';
-$labels['sent']   = '�ｳｴ�ず�失�ｧ��物';
+$labels['inbox']  = '�ｰ幗捩 �失�ｧ��物';
+$labels['drafts'] = '�桷�亨 �ｳｴ�ｴ��物';
+$labels['sent']   = '�ｳｴ�ず �失�ｧ��物';
 $labels['trash']  = '�惷�ｧ���ｵ';
-$labels['junk']   = '��倣〓�ｩ肥攵';
+$labels['junk']   = '�侃�減 �失�ｧ��物';
 
 // message listing
 $labels['subject'] = '��罹ｪｩ';
 $labels['from']    = '�ｳｴ�ざ�株 �ぎ�梃';
-$labels['sender']  = '�ｳｴ�ず �ぎ�梃';
+$labels['sender']  = '�ｰ懍侠�攤';
 $labels['to']      = '�ｰ幎株 �ぎ�梃';
 $labels['cc']      = '�ｰｸ�｡ｰ';
 $labels['bcc']     = '�葵�捩 �ｰｸ�｡ｰ';
 $labels['replyto'] = '�嚮�侠 �｣ｼ���';
-$labels['followupto'] = '�ｶ緋ｰ� �況�棗';
+$labels['followupto'] = '����峡';
 $labels['date']    = '�あ�ｧ�';
 $labels['size']    = '�〓�ｸｰ';
 $labels['priority'] = '�垈�│��懍怱';
 $labels['organization'] = '�ｸｰ�ｴ�';
-$labels['readstatus'] = '�ｳｴ�ｸｰ �メ���';
+$labels['readstatus'] = '�攷�搆 �メ���';
 $labels['listoptions'] = '�ｪｩ�｡� �亰���...';
 
 $labels['mailboxlist'] = '�抄�鵠';
-$labels['messagesfromto'] = '$count �ｰ� �､� $from �乱��� $to �ｲ� �ｩ肥亨�ｧ�';
-$labels['threadsfromto'] = '$from �乱��� $to �ｹ護ｧ� $count �ｰ懍攪 �堂��壱糖';
-$labels['messagenrof'] = '$count �ｰ� �､� $nr �ｲ� �ｩ肥亨�ｧ�';
-$labels['fromtoshort'] = '$from �乱��� $to �ｹ護ｧ� $count �ｰ�';
+$labels['messagesfromto'] = '�ｴ� $count�ｰ� �､� $from �ｲ溢ｧｸ�ｶ��┣ $to �ｲ溢ｧｸ�ｹ護ｧ��攪 �ｩ肥亨�ｧ�';
+$labels['threadsfromto'] = '�ｴ� $count�ｰ� �､� $from �ｲ溢ｧｸ�ｶ��┣ $to �ｲ溢ｧｸ�ｹ護ｧ��攪 �侃��壱糖';
+$labels['messagenrof'] = '�ｴ� $count�ｰ� �､�  $nr �ｲ溢ｧｸ �ｩ肥亨�ｧ�';
+$labels['fromtoshort'] = '�ｴ� $count�ｰ� �､� $from �ｲ溢ｧｸ - $to �ｲ溢ｧｸ';
 
-$labels['copy']     = '�ｰｸ�｡ｰ';
+$labels['copy']     = '�ｳｵ�ぎ';
 $labels['move']     = '�擽�徐';
-$labels['moveto']   = '�擽�徐...';
+$labels['moveto']   = '�擽�徐�腹 �怱�ｹ�...';
 $labels['download'] = '�共�垓�｡罹糖';
-$labels['showattachment'] = '�像�亨';
-$labels['showanyway'] = '�墳�メ �像�亨';
+$labels['open']     = '�龍�ｸｰ';
+$labels['showattachment'] = '�ｳｴ�ｸｰ';
+$labels['showanyway'] = '�ｷｸ�椈�巡 �墳�メ �ｳｴ�ｸｰ';
 
-$labels['filename'] = '�血�攵 �擽�ｦ�';
+$labels['filename'] = '�血�攵�ｪ�';
 $labels['filesize'] = '�血�攵 �〓�ｸｰ';
 
 $labels['addtoaddressbook'] = '�｣ｼ��誤｡晧乱 �ｶ緋ｰ�';
@@ -122,114 +123,117 @@ $labels['today'] = '�丶�釜';
 
 // toolbar buttons
 $labels['refresh']          = '�ヨ�｡� �ｳ��ｹｨ';
-$labels['checkmail']        = '�ヨ �ｩ肥攵 �剳�攤';
-$labels['compose']          = '�ｩ肥攵 �堂�ｸｰ';
-$labels['writenewmessage']  = '�ヨ �ｩ肥攵 �梠�┳';
+$labels['checkmail']        = '�ヨ �ｩ肥亨�ｧ� �剳�攤';
+$labels['compose']          = '�ｩ肥亨�ｧ� �梠�┳';
+$labels['writenewmessage']  = '�ヨ �ｩ肥亨�ｧ� ��晧┳';
 $labels['reply']            = '�嚮�侠';
-$labels['replytomessage']   = '�嚮�侠 �梠�┳';
-$labels['replytoallmessage'] = '�ｳｴ�ず�擽�凰 �ｪｨ�蕩 ��們侠�梵�乱�ｲ� �嚮�侠';
+$labels['replytomessage']   = '�ｰ懍侠�攤�乱�ｲ� �嚮�侠';
+$labels['replytoallmessage'] = '�ｳｴ�ず �ぎ�梃�ｳｼ �ｪｨ�蕩 ��們侠�攤�乱�ｲ� �嚮�侠';
 $labels['replyall']         = '����ｲｴ �嚮�侠';
 $labels['replylist']        = '�嚮�侠 �ｪｩ�｡�';
 $labels['forward']          = '����峡';
-$labels['forwardinline']    = '����峡';
-$labels['forwardattachment'] = '�ｩ肥攵�揆 �ｲｨ�ｶ��血�攵�｡� ����峡';
-$labels['forwardmessage']   = '�ｩ肥攵 ����峡';
-$labels['deletemessage']    = '�ｩ肥攵 �く���';
-$labels['movemessagetotrash'] = '�ｩ肥攵 �惷�ｧ���ｵ�愍�｡� �擽�徐';
-$labels['printmessage']     = '�ｩ肥攵 �攤���';
-$labels['previousmessage']  = '�擽��� �ｩ肥攵 �ｳｴ�ｸｰ';
-$labels['firstmessage']     = '�ｲ們搆 �ｩ肥攵 �ｳｴ�ｸｰ';
-$labels['nextmessage']      = '�共�搆 �ｩ肥攵 �ｳｴ�ｸｰ';
-$labels['lastmessage']      = '�ｧ溢ｧ��ｧ� �ｩ肥攵 �ｳｴ�ｸｰ';
-$labels['backtolist']       = '�ｩ肥攵 �ｪｩ�｡晧愍�｡�';
+$labels['forwardinline']    = '�ｳｸ�ｬｸ �ざ�圸�愍�｡� ����峡';
+$labels['forwardattachment'] = '�ｲｨ�ｶ��血�攵�｡� ����峡';
+$labels['forwardmessage']   = '�ｩ肥亨�ｧ� ����峡';
+$labels['deletemessage']    = '�ｩ肥亨�ｧ� �く���';
+$labels['movemessagetotrash'] = '�ｩ肥亨�ｧ��･ｼ �惷�ｧ���ｵ�愍�｡� �擽�徐';
+$labels['printmessage']     = '�擽 �ｩ肥亨�ｧ� �攤���';
+$labels['previousmessage']  = '�擽��� �ｩ肥亨�ｧ� �ｳｴ�ｸｰ';
+$labels['firstmessage']     = '�ｲ們搆 �ｩ肥亨�ｧ� �像�亨';
+$labels['nextmessage']      = '�共�搆 �ｩ肥亨�ｧ� �像�亨';
+$labels['lastmessage']      = '�ｧ溢ｧ��ｧ� �ｩ肥亨�ｧ� �像�亨';
+$labels['backtolist']       = '�ｩ肥攵 �ｪｩ�｡晧愍�｡� �曙�符�ｰ��ｸｰ';
 $labels['viewsource']       = '��護侃 �ｳｴ�ｸｰ';
 $labels['mark']             = '�像�亨';
-$labels['markmessages']     = '�ｩ肥亨�ｧ� �像�亨';
-$labels['markread']         = '�攷�捩 �ｲ��愍�｡� �像�亨';
-$labels['markunread']       = '�攷�ｧ� �賦�捩 �ｲ��愍�｡� �像�亨';
-$labels['markflagged']      = '�ｹ��ｰ� �峡�ｸｰ';
-$labels['markunflagged']    = '�ｹ��ｰ� �ざ�ｦｬ�ｸｰ';
-$labels['moreactions']      = '�擽�匣�攪 �徐�梠...';
+$labels['markmessages']     = '�ｩ肥亨�ｧ� �像�亨�葺�ｸｰ';
+$labels['markread']         = '�攷�搆�愍�｡� �像�亨';
+$labels['markunread']       = '�攷�ｧ� �賦�搆�愍�｡� �像�亨';
+$labels['markflagged']      = '�ｹ��ｰ罹｡� �像�亨�勢�愍�｡� �像�亨';
+$labels['markunflagged']    = '�ｹ��ｰ罹｡� �像�亨�据�ｧ� �賦�搆�愍�｡� �像�亨';
+$labels['moreactions']      = '�ｶ緋ｰ� �徐�梠...';
 $labels['more']             = '�鵠�ｳｴ�ｸｰ';
 $labels['back']             = '�彫�｡�';
-$labels['options']          = '�│��� �ぎ�墳';
+$labels['options']          = '�亰���';
 
 $labels['select'] = '�│���';
 $labels['all'] = '�ｪｨ�草';
 $labels['none'] = '�螺�搆';
 $labels['currpage'] = '����椪 �侍�擽�ｧ�';
 $labels['unread'] = '�攷�ｧ� �賦�搆';
-$labels['flagged'] = '�ｹ��ｰ�';
+$labels['flagged'] = '�ｹ��ｰ罹｡� �像�亨�勢';
 $labels['unanswered'] = '�況�棗�葺�ｧ� �賦�搆';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '�く��罹勢';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = '�く��罹据�ｧ� �賦�搆';
 $labels['invert'] = '�ｰ們��';
 $labels['filter'] = '�符�┣';
-$labels['list'] = '�ｦｬ�侃�敢';
-$labels['threads'] = '�堂��壱糖';
+$labels['list'] = '�ｪｩ�｡�';
+$labels['threads'] = '�侃��壱糖';
 $labels['expand-all'] = '�ｪｨ�草 �剳�棗';
-$labels['expand-unread'] = 'Expand Unread';
+$labels['expand-unread'] = '�攷�ｧ� �賦�捩 �ｩ肥亨�ｧ� �剳�棗';
 $labels['collapse-all'] = '�ｪｨ�草 ��滝ｸｰ';
-$labels['threaded'] = '�ｷｸ�｣ｹ�剩�勢';
-
-$labels['autoexpand_threads'] = '�ｪｨ�蕩 �ｩ肥亨�ｧ� �剳�棗';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = '�像�亨';
-$labels['attachment'] = '�ｲｨ�ｶ�';
+$labels['threaded'] = '�侃��壱糖�剩�勢';
+
+$labels['autoexpand_threads'] = '�ｩ肥亨�ｧ� �侃��壱糖 �剳�棗';
+$labels['do_expand'] = '�ｪｨ�蕩 �侃��壱糖';
+$labels['expand_only_unread'] = '�攷�ｧ� �賦�捩 �ｩ肥亨�ｧ��乱�ｧ� ����圸';
+$labels['fromto'] = '�ｳｴ�ざ�株 �ぎ�梃/�ｰ幎株 �ぎ�梃';
+$labels['flag'] = '�ｹ��ｰ罹｡� �像�亨';
+$labels['attachment'] = '�ｲｨ�ｶ��血�攵';
 $labels['nonesort'] = '�螺�搆';
-$labels['sentdate'] = '�ｳｴ�ず �あ�ｧ�';
-$labels['arrival'] = '��們侠 �あ�ｧ�';
+$labels['sentdate'] = '�ｰ懍侠�攵';
+$labels['arrival'] = '�巡�ｰｩ�攵';
 $labels['asc'] = '�丶�ｦ��ｰｨ���';
 $labels['desc'] = '�ざ�ｦｼ�ｰｨ���';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = '��簿�ｬ';
+$labels['listcolumns'] = '�龍 �ｪｩ�｡� �ｳｴ�ｸｰ';
+$labels['listsorting'] = '�龍 ��簿�ｬ';
 $labels['listorder'] = '��簿�ｬ ��懍��';
-$labels['listmode'] = 'List view mode';
+$labels['listmode'] = '�剩�ｩｴ �ｪｨ�糖 �ｪｩ�｡� �ｳｴ�ｸｰ';
 
 $labels['folderactions'] = '�抄�鵠 �ｪ���ｹ';
 $labels['compact'] = '�ｰ��卿�葺�ｲ�';
-$labels['empty'] = '�ｹ��垈�ｸｰ';
+$labels['empty'] = '�ｹ��牟 �梭�搆';
 
-$labels['quota'] = '�粕�侃�〓 �ぎ�圸';
-$labels['unknown']  = '�阜��� �螺�搆';
+$labels['quota'] = '�粕�侃�〓 �ぎ�圸�汢';
+$labels['unknown']  = '�阜 ��� �螺�搆';
 $labels['unlimited']  = '��懦復 �螺�搆';
 
-$labels['quicksearch']  = '�ｹｨ�ｦｬ �ｰｾ�ｸｰ';
-$labels['resetsearch']  = '�ｰｾ�ｸｰ �ｦｬ���';
-$labels['searchmod']  = 'Search modifiers';
+$labels['quicksearch']  = '�ｹ��･ｸ �ｲ��ラ';
+$labels['resetsearch']  = '�ｲ��ラ �椪�└���';
+$labels['searchmod']  = '��們�菩梵 �ｲ��ラ';
 $labels['msgtext']  = '����ｲｴ �ｩ肥亨�ｧ�';
-$labels['body']  = 'Body';
+$labels['body']  = '�ｳｸ�ｬｸ';
 
 $labels['openinextwin'] = '�ヨ �ｰｽ�乱��� �龍�ｸｰ';
-$labels['emlsave'] = '�共�垓�｡罹糖 (.eml)';
+$labels['emlsave'] = '�共�垓�｡罹糖(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
-$labels['sendmessage']    = '�ｩ肥攵 �ｧ��ｸ� �ｳｴ�ヤ';
-$labels['savemessage']    = '�糖�椈�売�敢 ����棗';
+$labels['editasnew']      = '�ヨ �ｩ肥亨�ｧ��｡� �失�ｧ�';
+$labels['send']           = '�ｳｴ�ざ�ｸｰ';
+$labels['sendmessage']    = '�ｩ肥攵 �ｳｴ�ざ�ｸｰ';
+$labels['savemessage']    = '�桷�亨 �ｳｴ�ｴ��物�乱 ����棗';
 $labels['addattachment']  = '�血�攵 �ｲｨ�ｶ�';
-$labels['charset']        = '�ｬｸ�梵���';
-$labels['editortype']     = '�失�ｧ滝ｸｰ ��倣��';
-$labels['returnreceipt']  = '��們侠 �剳�攤 �囈�ｲｭ�葺�ｸｰ';
-$labels['dsn']            = '�����｡�メ��� �ｩ肥攵 �ｰ幀ｸｰ';
-$labels['mailreplyintro'] = '$date�乱, $sender�ｰ� �梠�┳:';
+$labels['charset']        = '�攤�ｽ罷畠';
+$labels['editortype']     = '�失�ｧ滝ｸｰ �悛���';
+$labels['returnreceipt']  = '��們侠 �剳�攤';
+$labels['dsn']            = '�����｡ �メ��� �阜�ｦｼ';
+$labels['mailreplyintro'] = '$date�乱 $sender�擽(�ｰ�) �梠�┳�復 �ざ�圸:';
 $labels['originalmessage'] = '�寳�ｳｸ �ｩ肥┷�ｧ�';
 
-$labels['editidents']    = 'Edit identities';
+$labels['editidents']    = '�侠�寳 �失�ｧ�';
 $labels['spellcheck']    = '�ｧ樌ｶ､�ｲ�';
-$labels['checkspelling'] = '�侃�滋�ｧ� �ｲｴ�〓';
-$labels['resumeediting'] = '�失�ｧ� �ｳ����';
-$labels['revertto']      = '�曙�符�ｰ�';
+$labels['checkspelling'] = '�ｧ樌ｶ､�ｲ� �ｲ��ぎ�葺�ｸｰ';
+$labels['resumeediting'] = '�失�ｧ� �ｳ���削葺�ｸｰ';
+$labels['revertto']      = '�曙�符�ｰ��ｸｰ';
 
 $labels['attach'] = '�ｲｨ�ｶ�';
-$labels['attachments'] = '�ｲｨ�ｶ� �血�攵';
+$labels['attachments'] = '�ｲｨ�ｶ��血�攵';
 $labels['upload'] = '�羅�｡罹糖';
-$labels['uploadprogress'] = '$percent ($total �乱��� $current)';
+$labels['uploadprogress'] = '$percent ($total�ｰ� �､� $current�ｰ�)';
 $labels['close']  = '�境�ｸｰ';
-$labels['messageoptions']  = '�ｩ肥亨�ｧ� �亰���(�豆)...';
+$labels['messageoptions']  = '�ｩ肥亨�ｧ� �亰���...';
 
 $labels['low']     = '�ぐ�搆';
 $labels['lowest']  = '�ｰ��棗 �ぐ�搆';
@@ -238,86 +242,86 @@ $labels['high']    = '��廷搆';
 $labels['highest'] = '�ｰ��棗 ��廷搆';
 
 $labels['nosubject']  = '(��罹ｪｩ �螺�搆)';
-$labels['showimages'] = '�擽�ｯｸ�ｧ� �像�亨';
-$labels['alwaysshow'] = '$sender �乱��� �乖 �擽�ｯｸ�ｧ� �墳�メ �ｳｴ�ｸｰ';
-$labels['isdraft']    = '�擽 �ｩ肥亨�ｧ��株 �桷�亨 �ｳｴ�ｴ� �ｩ肥亨�ｧ� �桿�笈�共.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['showimages'] = '�擽�ｯｸ�ｧ� �ｳｴ�ｸｰ';
+$labels['alwaysshow'] = '$sender�乱��� ��們侠�頗 �擽�ｯｸ�ｧ� �墳�メ �ｳｴ�ｸｰ';
+$labels['isdraft']    = '�擽�ｲ��捩 �梠�┳ �､卓攤 �ｩ肥亨�ｧ��桿�笈�共.';
+$labels['andnmore']   = '$nr �鵠 �ｳｴ�ｸｰ...';
+$labels['togglemoreheaders'] = '�ｩ肥亨�ｧ� �陸�鵠 �鵠 �ｳｴ�ｸｰ';
+$labels['togglefullheaders'] = '�寳 �ｩ肥亨�ｧ� �陸�鵠 �像�亨/�葵�ｸｰ�ｸｰ';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '�攵�ｰ� ��作侃�敢';
-$labels['savesentmessagein'] = '�ｳｴ�ず �ｩ肥亨�ｧ��･ｼ �共�搆�乱 ����棗';
+$labels['savesentmessagein'] = '�ｳｴ�ず �ｩ肥亨�ｧ��･ｼ �共�搆 �怱�ｹ們乱 ����棗';
 $labels['dontsave'] = '����棗�葺�ｧ� �賦�搆';
-$labels['maxuploadsize'] = '�ｵ罹劇 �血�攵 �〓�ｸｰ�株 $size �桿�笈�共';
+$labels['maxuploadsize'] = '�ｵ罹劇 �来�圸 �血�攵 �〓�ｸｰ�株 $size �桿�笈�共';
 
-$labels['addcc'] = '�ｰｸ�｡ｰ �┘�ｸｰ';
-$labels['addbcc'] = '�葵�捩�ｰｸ�｡ｰ �┘�ｸｰ';
-$labels['addreplyto'] = '�嚮�侠�｣ｼ��� �┘�ｸｰ';
-$labels['addfollowupto'] = 'Add Followup-To';
+$labels['addcc'] = '�ｰｸ�｡ｰ �ｶ緋ｰ�';
+$labels['addbcc'] = '�葵�捩 �ｰｸ�｡ｰ �ｶ緋ｰ�';
+$labels['addreplyto'] = '�嚮�侠 �｣ｼ��� �ｶ緋ｰ�';
+$labels['addfollowupto'] = '����峡 �ｶ緋ｰ�';
 
 // mdn
-$labels['mdnrequest'] = '�擽 �ｩ肥亨�ｧ��･ｼ �ｳｴ�ず �ｶ��擽 �攷�搆 �剳�攤 �囈�ｲｭ�揆 �毎�慣�笈�共. �剳�攤�腹�ｹ護囈?';
-$labels['receiptread'] = '�攷�搆 �剳�攤 �ｳｴ�ざ�ｸｰ';
-$labels['yourmessage'] = '�胸�侠�攪 �ｩ肥亨�ｧ��･ｼ �攷�来�慣�笈�共.';
-$labels['receiptnote'] = '�｣ｼ�攪: �擽 �剳�攤�捩 �擽 �ｩ肥亨�ｧ��ｰ� ��們侠�梵�攪 �ｻｴ�鐙�┣�乱 �像�亨�頗 �ｲ��ｧ護揆 �攪�ｯｸ�鮒�笈�共. ��們侠�梵�ｰ� �ｰ俯糖�亨 �擽 �ｩ肥攵�揆 �攷�ｱｰ�ｘ �擽�紛�毎�共�株 �ｲ��捩 �符�漁�笈�共.';
+$labels['mdnrequest'] = '�擽 �ｩ肥亨�ｧ��･ｼ �ｳｴ�ず �ぎ�梃�擽 �ぎ�圸�梵�ｰ� �擽 �ｩ肥亨�ｧ��･ｼ �攷�来�揆 �阜 �攷�搆 �剳�攤�揆 �囈�ｲｭ�毎�慣�笈�共. �ｳｴ�ず �ぎ�梃�乱�ｲ� �阜�ｦｬ�亨�ｲ��慣�笈�ｹ�?';
+$labels['receiptread'] = '��們侠 �剳�攤 (�攷�搆)';
+$labels['yourmessage'] = '�擽�ｲ��捩 �ぎ�圸�梵�攪 �ｩ肥亨�ｧ��乱 �劇�復 ��們侠 �剳�攤�桿�笈�共.';
+$labels['receiptnote'] = '�ｰｸ�ｳ�: �擽 ��們侠 �剳�攤�捩 �擽 �ｩ肥亨�ｧ��ｰ� �ｰ幎株 �ぎ�梃�攪 �ｻｴ�鐙�┣�乱 �像�亨�据�来�共�株 �ｲ��ｧ護揆 �攪�ｯｸ�鮒�笈�共. �ｰ幎株 �ぎ�梃�擽 �ｩ肥亨�ｧ� �ざ�圸�揆 �攷�ｱｰ�ｘ �擽�紛�毎�共�株 �ｳｴ�棗�捩 �螺�慣�笈�共.';
 
 // address boook
-$labels['name']         = '�像�亨 �擽�ｦ�';
+$labels['name']         = '�像�亨�ｪ�';
 $labels['firstname']    = '�擽�ｦ�';
 $labels['surname']      = '�┳';
 $labels['middlename']   = '�ｰ��垓�魂 �擽�ｦ�';
 $labels['nameprefix']   = '��瀧草�ぎ';
 $labels['namesuffix']   = '��瀧ｯｸ�ぎ';
-$labels['nickname']     = '�ｳ��ｪ�';
+$labels['nickname']     = '�ｳ��ｹｭ';
 $labels['jobtitle']     = '�ｧ��怱';
 $labels['department']   = '�ｶ����';
 $labels['gender']       = '�┳�ｳ�';
-$labels['maidenname']   = '�ｲｰ�仂 ��� �擽�ｦ�';
+$labels['maidenname']   = '�ｲｰ�仂 ��� �┳';
 $labels['email']        = '�擽�ｩ肥攵';
 $labels['phone']        = '����剩';
 $labels['address']      = '�｣ｼ���';
-$labels['street']       = '�┷�ｶ��｣ｼ���';
+$labels['street']       = '�ｘ�ｨｸ�ｧ� �｣ｼ���';
 $labels['locality']     = '�亨/�ｵｬ/�ｵｰ';
 $labels['zipcode']      = '�垈�失�ｲ逸从';
-$labels['region']       = '�巡';
+$labels['region']       = '�亨/�巡';
 $labels['country']      = '�ｵｭ�ｰ�';
 $labels['birthday']     = '��晤���對�攵';
 $labels['anniversary']  = '�ｸｰ��川攵';
 $labels['website']      = '�峪�ぎ�擽�敢';
-$labels['instantmessenger'] = '�ｩ肥侠��ｸ';
-$labels['notes'] = '��ｸ�敢';
+$labels['instantmessenger'] = '�攤�侃�╋�敢 �ｩ肥侠���';
+$labels['notes'] = '�ｩ罷ｪｨ';
 $labels['male']   = '�お�┳';
 $labels['female'] = '�流�┳';
-$labels['manager'] = '�ｴ��ｦｬ�梵';
-$labels['assistant'] = '�巡�垈�ｯｸ';
+$labels['manager'] = '�メ�ぎ';
+$labels['assistant'] = '�ｹ����';
 $labels['spouse'] = '�ｰｰ�垈�梵';
-$labels['allfields'] = '�ｹ懋ｵｬ ����ｲｴ';
+$labels['allfields'] = '�ｪｨ�蕩 �墳�ｪｩ';
 $labels['search'] = '�ｲ��ラ';
-$labels['advsearch'] = '�メ�┷ �ｲ��ラ';
-$labels['advanced'] = '�ｳ��ｸ� �└���';
-$labels['other'] = '�ｷｸ �匣';
+$labels['advsearch'] = '�ｳ��ｸ� �ｲ��ラ';
+$labels['advanced'] = '�ｳ��ｸ�';
+$labels['other'] = '�ｸｰ�ム';
 
-$labels['typehome']   = '�刪';
+$labels['typehome']   = '�梵���';
 $labels['typework']   = '�ｧ��棗';
-$labels['typeother']  = '�ｷｸ �匣';
-$labels['typemobile']  = '�惷�劇�床';
-$labels['typemain']  = '�｣ｼ';
-$labels['typehomefax']  = '�見�侃(�ｧ�)';
-$labels['typeworkfax']  = '�見�侃(�ｧ��棗)';
+$labels['typeother']  = '�ｸｰ�ム';
+$labels['typemobile']  = '�惷�劇����剩';
+$labels['typemain']  = '�劇�像';
+$labels['typehomefax']  = '�梵��� �見�侃';
+$labels['typeworkfax']  = '�ｧ��棗 �見�侃';
 $labels['typecar']  = '�梵�徐�ｰｨ';
 $labels['typepager']  = '�从�ｶ懋ｸｰ';
 $labels['typevideo']  = '�徐����メ';
-$labels['typeassistant']  = '�巡�垈�ｯｸ';
-$labels['typehomepage']  = '�刪 �侍�擽�ｧ�';
+$labels['typeassistant']  = '�ｹ����';
+$labels['typehomepage']  = '�刪�侍�擽�ｧ�';
 $labels['typeblog'] = '�ｸ罷｡懋ｷｸ';
 $labels['typeprofile'] = '�梵�ｸｰ��語ｰ�';
 
-$labels['addfield'] = '�墳�ｪｩ �ｶ緋ｰ�..';
+$labels['addfield'] = '�符�糖 �ｶ緋ｰ�..';
 $labels['addcontact'] = '�ヨ �硫�攷�ｲ� �ｶ緋ｰ�';
 $labels['editcontact'] = '�硫�攷�ｲ� �失�ｧ�';
 $labels['contacts'] = '�硫�攷�ｲ�';
-$labels['contactproperties'] = 'Contact properties';
+$labels['contactproperties'] = '�硫�攷�ｲ� ��作┳';
 $labels['personalinfo'] = '�ｰ懍攤 ��簿ｳｴ';
 
 $labels['edit']   = '�失�ｧ�';
@@ -327,207 +331,205 @@ $labels['delete'] = '�く���';
 $labels['rename'] = '�擽�ｦ� �ｳ��ｲｽ';
 $labels['addphoto'] = '�ｶ緋ｰ�';
 $labels['replacephoto'] = '�ｰ緋ｾｸ�ｸｰ';
-$labels['uploadphoto'] = '�ぎ�ｧ� �豫�ｦｬ�ｸｰ';
+$labels['uploadphoto'] = '�ぎ�ｧ� �羅�｡罹糖';
 
-$labels['newcontact']     = '�ヨ �硫�攷�ｲ� �ｹｴ�糖 �ｧ誤豆�ｸｰ';
+$labels['newcontact']     = '�ヨ �硫�攷�ｲ� �ｹｴ�糖 ��晧┳';
 $labels['deletecontact']  = '�│��晨復 �硫�攷�ｲ� �く���';
-$labels['composeto']      = '�ヨ �ｩ肥攵 �梠�┳';
-$labels['contactsfromto'] = '$from �乱��� $to �｡懍攪 �硫�攷�ｲ� $count �ｰ�';
+$labels['composeto']      = '�ｩ肥攵 �梠�┳ �劇�メ';
+$labels['contactsfromto'] = '�ｴ� $count�ｰ懍攪 �硫�攷�ｲ� �､� $from �ｲ溢ｧｸ�ｶ��┣ $to �ｲ溢ｧｸ �ｹ護ｧ�';
 $labels['print']          = '�攤���';
 $labels['export']         = '�ざ�ｳｴ�ざ�ｸｰ';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = '�硫�攷�ｲ俯･ｼ vCard �小�ｧｷ�愍�｡� �ざ�ｳｴ�ざ�ｸｰ';
-$labels['newcontactgroup'] = '�ヨ�｡懍垓 �硫�攷�ｲ� �ｷｸ�｣ｹ ��晧┳';
-$labels['grouprename']    = '�ｷｸ�｣ｹ �擽�ｦ� �ｰ緋ｾｸ�ｸｰ';
+$labels['exportall']      = '�ｪｨ�草 �ざ�ｳｴ�ざ�ｸｰ';
+$labels['exportsel']      = '�│��晨復 �墳�ｪｩ �ざ�ｳｴ�ざ�ｸｰ';
+$labels['exportvcards']   = '�硫�攷�ｲ俯･ｼ vCard ��菩享�愍�｡� �ざ�ｳｴ�ざ�ｸｰ';
+$labels['newcontactgroup'] = '�ヨ �硫�攷�ｲ� �ｷｸ�｣ｹ ��晧┳';
+$labels['grouprename']    = '�ｷｸ�｣ｹ�ｪ� �ｳ��ｲｽ';
 $labels['groupdelete']    = '�ｷｸ�｣ｹ �く���';
 $labels['groupremoveselected'] = '�ｷｸ�｣ｹ�乱��� �│��晨復 �硫�攷�ｲ� ��懋ｱｰ';
 
-$labels['previouspage']   = '�擽��� �┷�敢 �ｳｴ�ｸｰ';
-$labels['firstpage']      = '�ｲ們搆 �┷�敢 �ｳｴ�ｸｰ';
-$labels['nextpage']       = '�共�搆 �┷�敢 �ｳｴ�ｸｰ';
-$labels['lastpage']       = '�ｧ溢ｧ��ｧ� �┷�敢 �ｳｴ�ｸｰ';
+$labels['previouspage']   = '�擽��� �侍�擽�ｧ� �ｳｴ�ｸｰ';
+$labels['firstpage']      = '�ｲ們搆 �侍�擽�ｧ� �ｳｴ�ｸｰ';
+$labels['nextpage']       = '�共�搆 �侍�擽�ｧ� �ｳｴ�ｸｰ';
+$labels['lastpage']       = '�ｧ溢ｧ��ｧ� �侍�擽�ｧ� �ｳｴ�ｸｰ';
 
 $labels['group'] = '�ｷｸ�｣ｹ';
 $labels['groups'] = '�ｷｸ�｣ｹ';
 $labels['personaladrbook'] = '�ｰ懍攤 �｣ｼ���';
 
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
+$labels['searchsave'] = '�ｲ��ラ ����棗';
+$labels['searchdelete'] = '�ｲ��ラ �く���';
 
 $labels['import'] = '�ｰ���ｸ�丶�ｸｰ';
 $labels['importcontacts'] = '�硫�攷�ｲ� �ｰ���ｸ�丶�ｸｰ';
-$labels['importfromfile'] = '�血�攵�乱��� �ｰ���ｸ�丶�ｸｰ';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = '����ｲｴ �｣ｼ��誤｡晧揆 �ｰ緋ｿ�';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importfromfile'] = '�血�攵�乱��� �ｰ���ｸ�丶�ｸｰ:';
+$labels['importtarget'] = '�ヨ �硫�攷�ｲ俯･ｼ �｣ｼ��誤｡晧乱 �ｶ緋ｰ�:';
+$labels['importreplace'] = '����ｲｴ �｣ｼ��誤｡晧揆 �ｰ緋ｾｸ�ｸｰ';
+$labels['importdesc'] = '�ｸｰ�｡ｴ �｣ｼ��誤｡晧乱��� �硫�攷�ｲ俯･ｼ �ｰ���ｸ�豫 ��� �梭�慣�笈�共.<br/> ����椪 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> �魂�擽�┣ ��菩享�乱��� �｣ｼ��� �ｰ���ｸ�丶�ｸｰ�･ｼ �ｧ��寳�鮒�笈�共.\'';
 $labels['done'] = '�刋�｣�';
 
 // settings
 $labels['settingsfor'] = '�└���';
-$labels['about'] = '�擽�ｲ��捩...';
-$labels['preferences'] = '�劍�ｲｽ �└���';
-$labels['userpreferences'] = '�ぎ�圸�梵 �劍�ｲｽ';
-$labels['editpreferences'] = '�ぎ�圸�梵 �劍�ｲｽ �失�ｧ�';
+$labels['about'] = '��簿ｳｴ...';
+$labels['preferences'] = '�劍�ｲｽ�└���';
+$labels['userpreferences'] = '�ぎ�圸�梵 �劍�ｲｽ�└���';
+$labels['editpreferences'] = '�ぎ�圸�梵 �劍�ｲｽ�└��� �失�ｧ�';
 
 $labels['identities'] = '�侠�寳';
 $labels['manageidentities'] = '�擽 �ｳ���菩攪 �侠�寳 �ｴ��ｦｬ';
 $labels['newidentity'] = '�ヨ �侠�寳';
 
-$labels['newitem'] = '�ヨ �符�擽���';
-$labels['edititem'] = '�符�擽��� �失�ｧ�';
+$labels['newitem'] = '�ヨ �墳�ｪｩ';
+$labels['edititem'] = '�墳�ｪｩ �失�ｧ�';
 
-$labels['preferhtml'] = 'HTML �ｳｴ�擽�ｸｰ';
-$labels['defaultcharset'] = '�ｸｰ�ｳｸ �ｬｸ�梵 �┷�敢';
+$labels['preferhtml'] = 'HTML �像�亨';
+$labels['defaultcharset'] = '�ｸｰ�ｳｸ �攤�ｽ罷畠';
 $labels['htmlmessage'] = 'HTML �ｩ肥亨�ｧ�';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = '�ｶ��ｶ�';
+$labels['digitalsig'] = '�粕�ｧ��┷ ��罹ｪ�';
 $labels['dateformat'] = '�あ�ｧ� ��菩享';
 $labels['timeformat'] = '�亨�ｰ� ��菩享';
-$labels['prettydate'] = '�あ�ｧ� ��菩享';
-$labels['setdefault']  = '�ｸｰ�ｳｸ�愍�｡� �└���';
+$labels['prettydate'] = '�ｰ��ｲｰ�復 �あ�ｧ�';
+$labels['setdefault']  = '�ｸｰ�ｳｸ �└���';
 $labels['autodetect']  = '�梵�徐';
 $labels['language']  = '�椋�牟';
 $labels['timezone']  = '�亨�ｰ��劇';
-$labels['pagesize']  = '�侍�擽�ｧ��胸 �､� ���';
+$labels['pagesize']  = '�侍�擽�ｧ��胸 �哩 ���';
 $labels['signature'] = '��罹ｪ�';
-$labels['dstactive']  = '��罹ｨｸ�ム�桷';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
-$labels['htmleditor'] = 'HTML �ｩ肥攵 �堂�ｸｰ';
-$labels['htmlonreply'] = 'HTML �ｩ肥亨�ｧ��乱 �嚮�侠�腹 �阜�乱 �ｧ�';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['dstactive']  = '�攵�ｴ� ��溢平 �亨�ｰ�';
+$labels['showinextwin'] = '�ｩ肥亨�ｧ��･ｼ �ヨ �ｰｽ�乱��� �龍�ｸｰ';
+$labels['composeextwin'] = '�ヨ �ｰｽ�乱��� �梠�┳�葺�ｸｰ';
+$labels['htmleditor'] = 'HTML �ｩ肥亨�ｧ� �梠�┳';
+$labels['htmlonreply'] = 'HTML �ｩ肥亨�ｧ� �嚮�侠 �亨';
+$labels['htmlonreplyandforward'] = '����峡 ��尖株 HTML �ｩ肥亨�ｧ� �嚮�侠 �亨';
 $labels['htmlsignature'] = 'HTML ��罹ｪ�';
-$labels['previewpane'] = '�ｯｸ�ｦｬ �ｳｴ�ｸｰ �ｰｽ �ｳｴ�ｸｰ';
+$labels['showemail'] = 'Show email address with display name';
+$labels['previewpane'] = '�ｯｸ�ｦｬ�ｳｴ�ｸｰ �ｰｽ �ｳｴ�ｸｰ';
 $labels['skin'] = '�攤�┣�侍�擽�侃 �侃�お';
 $labels['logoutclear'] = '�｡懋ｷｸ�符�寃�腹 �阜 �惷�ｧ���ｵ �ｹ��垈�ｸｰ';
-$labels['logoutcompact'] = '�｡懋ｷｸ�符�寃�腹 �阜 �ｰ幗捩�失�ｧ��物 �封�ｶ倣葺�ｸｰ';
+$labels['logoutcompact'] = '�｡懋ｷｸ�符�寃�腹 �阜 �ｰ幗捩 �失�ｧ��物 �封�ｶ倣葺�ｸｰ';
 $labels['uisettings'] = '�ぎ�圸�梵 �攤�┣�侍�擽�侃';
 $labels['serversettings'] = '��罹ｲ� �└���';
-$labels['mailboxview'] = '�ｩ肥攵 �メ�梵 �ｳｴ�ｸｰ';
-$labels['mdnrequests'] = '��們侠 �剳�攤';
-$labels['askuser'] = '�ぎ�圸�梵�乱�ｲ� �ｬｻ�ｸｰ';
-$labels['autosend'] = '�梵�徐�愍�｡� �ｳｴ�ざ�ｸｰ';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = '�ｬｴ�亨';
-$labels['readwhendeleted'] = '�く��懦腹 �阜 �ｩ肥亨�ｧ��･ｼ �攷�捩 �ｲ��愍�｡� �像�亨';
-$labels['flagfordeletion'] = '�ｧ��垈�株 �劇�侠 �ｧ��垪 �ｩ肥亨�ｧ��乱 �ｹ��ｰ� �峡�ｸｰ';
-$labels['skipdeleted'] = '�ｧ��垓 �ｩ肥亨�ｧ� �ｳｴ�擽�ｧ� �賦�ｸｰ';
-$labels['deletealways'] = '�惷�ｧ���ｵ�愍�｡� �ｩ肥亨�ｧ� �擽�徐�揆 �共�肩�葺�ｩｴ, �く���';
-$labels['deletejunk'] = '��倣〓 �ｩ肥攵�物�乱 �梭�株 �ｩ肥亨�ｧ��豆�揆 �ｰ罷｡� �く���';
-$labels['showremoteimages'] = '�寳�ｲｩ �擽�ｯｸ�ｧ� �ｳｴ�擽�ｸｰ';
-$labels['fromknownsenders'] = '�符�株 �ｰ懍侠�攤�乱�ｲ護�罹ｧ�';
+$labels['mailboxview'] = '�ｩ肥攵�物 �剩�ｩｴ';
+$labels['mdnrequests'] = '��們侠 �剳�攤 �囈�ｲｭ �亨';
+$labels['askuser'] = '�ぎ�圸�梵�乱�ｲ� �ｬｼ�牟�ｴ�';
+$labels['autosend'] = '��們侠 �剳�攤 �ｳｴ�ざ�ｸｰ';
+$labels['autosendknown'] = '�ざ �硫�攷�ｲ們乱 ��們侠 �剳�攤 �囈�ｲｭ�揆 �ｳｴ�ヤ, �符�巨 �ｲｽ�垈 �ｬｼ�牟�ｴ�';
+$labels['autosendknownignore'] = '�ざ �硫�攷�ｲ們乱 ��們侠 �剳�攤 �囈�ｲｭ�揆 �ｳｴ�ヤ, �符�巨 �ｲｽ�垈 �ｬｴ�亨�物';
+$labels['ignore'] = '�ｬｴ�亨�物';
+$labels['readwhendeleted'] = '�く��� �亨 �ｩ肥亨�ｧ��･ｼ �攷�搆�愍�｡� �像�亨';
+$labels['flagfordeletion'] = '�く��� �劇�侠 �く��� �劇�メ �ｩ肥亨�ｧ��･ｼ �ｹ��ｰ罹｡� �像�亨';
+$labels['skipdeleted'] = '�く��罹頗 �ｩ肥亨�ｧ� �ｳｴ�ｧ� �賦�ｸｰ';
+$labels['deletealways'] = '�ｩ肥亨�ｧ��･ｼ �惷�ｧ���ｵ�愍�｡� �擽�徐�葺�株 �梠�羅�乱 �共�肩�腹 �ｲｽ�垈 �く���';
+$labels['deletejunk'] = '�侃�減 �ｩ肥攵�物�乱 �梭�株 �ｩ肥亨�ｧ��･ｼ �ｰ罷｡� �く���';
+$labels['showremoteimages'] = '�ｳｸ�ｬｸ �ざ�圸�攪 �寳�ｲｩ �擽�ｯｸ�ｧ� �像�亨';
+$labels['fromknownsenders'] = '�阜��､�ｧ� �ｰ懍侠�攤�愍�｡罹ｶ��┣ �ｰ幗捩 �ｩ肥亨�ｧ��ｧ�';
 $labels['always'] = '�墳�メ';
-$labels['showinlineimages'] = '�ｩ肥亨�ｧ� �符�椈�乱 �ｲｨ�ｶ� �擽�ｯｸ�ｧ� �ｳｴ�擽�ｸｰ';
-$labels['autosavedraft']  = '�糖�椈�売�敢 �梵�徐 ����棗';
-$labels['everynminutes']  = '$n �ｶ��ｧ壱共';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['showinlineimages'] = '�ｩ肥亨�ｧ� �葺�卿�乱 �ｲｨ�ｶ� �擽�ｯｸ�ｧ� �像�亨';
+$labels['autosavedraft']  = '�梠�┳ �､卓攤 �ｩ肥亨�ｧ��･ｼ �梵�徐�愍�｡� ����棗';
+$labels['everynminutes']  = '�ｧ､ $n�ｶ� �ｧ壱共';
+$labels['refreshinterval']  = '�ヨ�｡� �ｳ��ｹｨ (�ヨ �ｩ肥亨�ｧ� �剳�攤, �ｸｰ�ム �導�導)';
 $labels['never']  = '�葺�ｧ� �賦�搆';
 $labels['immediately']  = '�ｦ餓亨';
-$labels['messagesdisplaying'] = '�ｩ肥亨�ｧ� �像�亨 �､�';
-$labels['messagescomposition'] = '�ｩ肥亨�ｧ� �梠�┳ �､�';
-$labels['mimeparamfolding'] = '�ｲｨ�ｶ� �血�攵 �擽�ｦ�';
+$labels['messagesdisplaying'] = '�ｩ肥亨�ｧ� �ｳｴ�ｸｰ';
+$labels['messagescomposition'] = '�ｩ肥亨�ｧ� �梠�┳';
+$labels['mimeparamfolding'] = '�ｲｨ�ｶ��血�攵�ｪ�';
 $labels['2231folding'] = 'Full RFC 2231 (�│�鵠�ｲ��糖)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS �符�寃�｣ｻ)';
-$labels['2047folding'] = 'Full RFC 2047 (�共�･ｸ �売�｡懋ｷｸ�棹�豆)';
-$labels['force7bit'] = '8-bit �ｬｸ�梵�豆�揆 �怱�紛��� MIME �攤�ｽ罷畠�揆 �ぎ�圸';
-$labels['advancedoptions'] = '�メ�┷ �└���';
-$labels['focusonnewmessage'] = '�ヨ �ｩ肥亨�ｧ��ｰ� �梭�愍�ｩｴ �ｸ誤攵�垈��� �怦�巡�垈�｡� �小�ｻ､�侃 �擽�徐';
-$labels['checkallfolders'] = '�ヨ �ｩ肥亨�ｧ��･ｼ �怱�紛 �ｪｨ�蕩 �抄�鵠 �ｲｴ�〓';
-$labels['displaynext'] = '�ｩ肥亨�ｧ� �く���/�擽�徐�復 �寇�乱�株 �共�搆 �ｩ肥亨�ｧ��･ｼ �像�亨';
-$labels['defaultfont'] = 'HTML �ｩ肥亨�ｧ��攪 �ｸｰ�ｳｸ �床�敢';
-$labels['mainoptions'] = '�｣ｼ �亰���';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS �符�寃�｣ｩ)';
+$labels['2047folding'] = 'Full RFC 2047 (�ｸｰ�ム)';
+$labels['force7bit'] = '8-bit �ｬｸ�梵�乱 MIME �攤�ｽ罷畠 �ぎ�圸';
+$labels['advancedoptions'] = '�ｳ��ｸ� �亰���';
+$labels['focusonnewmessage'] = '�ヨ �ｩ肥亨�ｧ��ｰ� �梭�揆 �ｲｽ�垈 �ｸ誤攵�垈��� �ｰｽ�愍�｡� �小�ｻ､�侃 �擽�徐';
+$labels['checkallfolders'] = '�ｪｨ�蕩 �抄�鵠�乱��� �ヨ �ｩ肥亨�ｧ� �剳�攤';
+$labels['displaynext'] = '�ｩ肥亨�ｧ� �く���/�擽�徐 �寇 �共�搆 �ｩ肥亨�ｧ� �像�亨';
+$labels['defaultfont'] = 'HTML �ｩ肥亨�ｧ��攪 �ｸｰ�ｳｸ �ｸ��ｼｴ';
+$labels['mainoptions'] = '�｣ｼ�囈 �亰���';
 $labels['browseroptions'] = '�ｸ誤攵�垈��� �亰���';
 $labels['section'] = '�┿���';
-$labels['maintenance'] = '�悛�ｧ� �ｴ��ｦｬ';
+$labels['maintenance'] = '�悛�ｧ��ｴ��ｦｬ';
 $labels['newmessage'] = '�ヨ �ｩ肥亨�ｧ�';
 $labels['signatureoptions'] = '��罹ｪ� �亰���';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = '�梵�徐�愍�｡� ��罹ｪ� �ｶ緋ｰ�';
-$labels['newmessageonly'] = '�ヨ�｡懍垓 �ｩ肥亨�ｧ��ｧ�';
-$labels['replyandforwardonly'] = '�嚮�侠�擽�ｘ ����峡 �ｩ肥亨�ｧ� �ｧ�';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
+$labels['whenreplying'] = '�嚮�侠 �亨';
+$labels['replyempty'] = '�寳�ｬｸ �ｩ肥亨�ｧ��･ｼ �攤�圸�葺�ｧ� �賦�搆';
+$labels['replytopposting'] = '�ヨ �ｩ肥亨�ｧ��･ｼ �攤�圸�ｬｸ �メ�卿�乱��� �亨�梠';
+$labels['replybottomposting'] = '�ヨ �ｩ肥亨�ｧ��･ｼ �攤�圸�ｬｸ �葺�卿�乱��� �亨�梠';
+$labels['replyremovesignature'] = '�嚮�侠 �亨 �ｩ肥亨�ｧ��乱��� �寳�ｬｸ ��罹ｪ��揆 ��懋ｱｰ';
+$labels['autoaddsignature'] = '��罹ｪ� �梵�徐�愍�｡� �ｶ緋ｰ�';
+$labels['newmessageonly'] = '�ヨ�｡懍垓 �ｩ肥亨�ｧ��乱�ｧ�';
+$labels['replyandforwardonly'] = '�嚮�侠 �ｰ� ����峡 �亨�乱�ｧ�';
 $labels['insertsignature'] = '��罹ｪ� �た�桿';
-$labels['previewpanemarkread']  = '�ｯｸ�ｦｬ �攷�椈 �ｩ肥亨�ｧ��･ｼ �攷�搆�愍�｡� �像�亨';
-$labels['afternseconds']  = '$n �ｴ� �擽�寇';
-$labels['reqmdn'] = '�墳�メ ��們侠�剳�攤 �囈�ｲｭ �葺�ｸｰ';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = '�ｩ肥亨�ｧ��･ｼ �ｳｴ�ざ�ｸｰ ����乱 �ｧ樌ｶ､�ｲ� �剳�攤';
-$labels['spellcheckoptions'] = '�ｧ樌ｶ､�ｲ� �剳�攤 �亰���';
-$labels['spellcheckignoresyms'] = '�峡�ｳｼ�擽 �小�物�頗 �卿�牟 �ｬｴ�亨�葺�ｸｰ';
-$labels['spellcheckignorenums'] = '�悪�梵�ｰ� �小�物�頗 �卿�牟 �ｬｴ�亨�葺�ｸｰ';
-$labels['spellcheckignorecaps'] = '�劇�ｬｸ�梵�ｰ� �小�物�頗 �卿�牟 �ｬｴ�亨�葺�ｸｰ';
+$labels['previewpanemarkread']  = '�ｯｸ�ｦｬ �ｳｸ �ｩ肥亨�ｧ��･ｼ �攷�搆�愍�｡� �像�亨';
+$labels['afternseconds']  = '$n�ｴ� �寇';
+$labels['reqmdn'] = '��們侠 �剳�攤�揆 �墳�メ �囈�ｲｭ';
+$labels['reqdsn'] = '�����｡ �メ��� �阜�ｦｼ�揆 �墳�メ �囈�ｲｭ';
+$labels['replysamefolder'] = ' �嚮�侠 �ｩ肥亨�ｧ��･ｼ �嚮�侠 �劇�メ �ｩ肥亨�ｧ��攪 �抄�鵠�｡� �擽�徐';
+$labels['defaultabook'] = '�ｸｰ�ｳｸ �｣ｼ��誤｡�';
+$labels['autocompletesingle'] = '�梵�徐�刋�┳�乱��� �劇�ｲｴ �擽�ｩ肥攵 �｣ｼ��誤･ｼ �ｱｴ�ц�怙';
+$labels['listnamedisplay'] = '�硫�攷�ｲ� ��簿�ｬ �ｰｩ�享';
+$labels['spellcheckbeforesend'] = '�ｩ肥亨�ｧ��･ｼ �ｳｴ�ざ�ｸｰ ����乱 �ｧ樌ｶ､�ｲ� �ｲ��ぎ';
+$labels['spellcheckoptions'] = '�ｧ樌ｶ､�ｲ� �ｲ��ぎ �亰���';
+$labels['spellcheckignoresyms'] = '�ｸｰ�从�ｰ� �小�物�頗 �卿�牟 �ｬｴ�亨';
+$labels['spellcheckignorenums'] = '�悪�梵�ｰ� �小�物�頗 �卿�牟 �ｬｴ�亨';
+$labels['spellcheckignorecaps'] = '�ｪｨ�草 �劇�ｬｸ�梵�｡� �像�ｸｰ�頗 �卿�牟 �ｬｴ�亨';
 $labels['addtodict'] = '�ぎ����乱 �ｶ緋ｰ�';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['mailtoprotohandler'] = 'mailto: �ｧ��〓�攪 �売�｡懦���ｽ� �ｲ俯ｦｬ�梵 �導�｡�';
+$labels['forwardmode'] = '�ｩ肥亨�ｧ� ����峡';
+$labels['inline'] = '�ｳｸ�ｬｸ �ざ�圸�愍�｡�';
+$labels['asattachment'] = '�ｲｨ�ｶ��血�攵�｡�';
 
 $labels['folder']  = '�抄�鵠';
 $labels['folders']  = '�抄�鵠';
-$labels['foldername']  = '�抄�鵠 �擽�ｦ�';
-$labels['subscribed']  = '�ｰ��桿�勢';
+$labels['foldername']  = '�抄�鵠�ｪ�';
+$labels['subscribed']  = '�ｵｬ�遵�物';
 $labels['messagecount'] = '�ｩ肥亨�ｧ�';
-$labels['create']  = '�ｧ誤豆�ｸｰ';
-$labels['createfolder']  = '�ヨ �抄�鵠 �ｧ誤豆�ｸｰ';
+$labels['create']  = '��晧┳';
+$labels['createfolder']  = '�ヨ �抄�鵠 ��晧┳';
 $labels['managefolders']  = '�抄�鵠 �ｴ��ｦｬ';
 $labels['specialfolders'] = '�柑��� �抄�鵠';
-$labels['properties'] = '�導�｡� ��簿ｳｴ';
-$labels['folderproperties'] = '�抄�鵠 �導�｡� ��簿ｳｴ';
+$labels['properties'] = '��作┳';
+$labels['folderproperties'] = '�抄�鵠 ��作┳';
 $labels['parentfolder'] = '�メ�怱 �抄�鵠';
-$labels['location'] = 'Location';
+$labels['location'] = '�怱�ｹ�';
 $labels['info'] = '��簿ｳｴ';
-$labels['getfoldersize'] = '�抄�鵠�攪 �ぎ�擽�ｦ壱･ｼ �阜�符�ｳｴ��､�ｩｴ ��ｴ�ｦｭ';
-$labels['changesubscription'] = '�ｵｬ�遵�揆 �ｳ��ｲｽ�葺��､�ｩｴ ��ｴ�ｦｭ';
-$labels['foldertype'] = '�抄�鵠 �ム�桿';
+$labels['getfoldersize'] = '�抄�鵠 �〓�ｸｰ�･ｼ �剳�攤�葺��､�ｩｴ ��ｴ�ｦｭ�葺�┷�囈';
+$labels['changesubscription'] = '�ｵｬ�遵�揆 �ｳ��ｲｽ�葺��､�ｩｴ ��ｴ�ｦｭ�葺�┷�囈';
+$labels['foldertype'] = '�抄�鵠 �悛���';
 $labels['personalfolder']  = '�ｰ懍攤 �抄�鵠';
 $labels['otherfolder']  = '�共�･ｸ �ぎ�圸�梵�攪 �抄�鵠';
-$labels['sharedfolder']  = '�ｳｵ�ｰ� �抄�鵠';
+$labels['sharedfolder']  = '�ｳｵ�悛 �抄�鵠';
 
-$labels['sortby'] = '��簿�ｬ';
+$labels['sortby'] = '��簿�ｬ �ｰｩ�享';
 $labels['sortasc']  = '�丶�ｦ��ｰｨ��懍愍�｡� ��簿�ｬ';
 $labels['sortdesc'] = '�ざ�ｦｼ�ｰｨ��懍愍�｡� ��簿�ｬ';
 $labels['undo'] = '�共�哩 �ｷｨ���';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = '�└�ｹ俯頗 �伯�洳�ｷｸ�攤';
 $labels['plugin'] = '�伯�洳�ｷｸ�攤';
 $labels['version'] = '�ｲ����';
-$labels['source'] = 'Source';
-$labels['license'] = '�攵�擽�┥�侃';
-$labels['support'] = '�ｧ��寳 �ｰ幀ｸｰ';
+$labels['source'] = '��護侃';
+$labels['license'] = '�攵�擽�│�侃';
+$labels['support'] = '�ｧ��寳 �囈�ｲｭ';
 
 // units
-$labels['B'] = '�ｰ肥擽�敢';
-$labels['KB'] = '�ぎ�｡罹ｰ肥擽�敢';
-$labels['MB'] = '�ｩ緋ｰ��ｰ肥擽�敢';
-$labels['GB'] = '�ｸｰ�ｰ��ｰ肥擽�敢';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
 // character sets
-$labels['unicode'] = '�悛�笈�ｽ罷糖(�卿�攵 �ｽ罷糖,�共�ｵｭ��� �ｧ��寳�ｽ罷糖)';
+$labels['unicode'] = '�悛�笈�ｽ罷糖';
 $labels['english'] = '����牟';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
+$labels['westerneuropean'] = '��懍悛�淇�牟';
+$labels['easterneuropean'] = '�徐�悛�淇�牟';
+$labels['southeasterneuropean'] = '�お�徐�悛�淇�牟';
+$labels['baltic'] = '�ｰ懦敢�牟';
+$labels['cyrillic'] = '�う�ｦｴ�牟';
+$labels['arabic'] = '�符�檮�牟';
+$labels['greek'] = '�ｷｸ�ｦｬ�侃�牟';
+$labels['hebrew'] = '�梭�ｸ誤ｦｬ�牟';
 $labels['turkish'] = '�┣�う�牟';
-$labels['nordic'] = 'Nordic';
+$labels['nordic'] = '�ｶ��悛�淇�牟';
 $labels['thai'] = '��懋ｵｭ�牟';
-$labels['celtic'] = 'Celtic';
+$labels['celtic'] = '�ｼ逸敢�牟';
 $labels['vietnamese'] = '�ｲ��敢�お�牟';
 $labels['japanese'] = '�攵�ｳｸ�牟';
 $labels['korean'] = '�復�ｵｭ�牟';
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index 4efd2f3d3..bf42c9c89 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -17,153 +17,156 @@
 */
 
 $messages = array();
-$messages['errortitle']  = '�乱�洳�ｰ� �ｰ懍��!';
+$messages['errortitle']  = '�丶�･� �ｰ懍��!';
 $messages['loginfailed']  = '�｡懋ｷｸ�攤�擽 �共�肩�葺����慣�笈�共.';
-$messages['cookiesdisabled'] = '�ｸ誤攵�垈����ｰ� �ｿ��う�･ｼ �ｧ��寳�葺�ｧ� �賦�慣�笈�共';
-$messages['sessionerror'] = '�┷��們擽 �悛�圷�葺�ｧ� �賦�ｱｰ�ｘ �｢��｣誤据�来�慣�笈�共';
+$messages['cookiesdisabled'] = '�ｸ誤攵�垈����ｰ� �ｿ��う�･ｼ �ｧ��寳�葺�ｧ� �賦�慣�笈�共.';
+$messages['sessionerror'] = '�┷��們擽 �悛�圷�葺�ｧ� �賦�ｱｰ�ｘ �｢��｣誤据�来�慣�笈�共.';
 $messages['storageerror'] = 'IMAP ��罹ｲ� �硫�ｲｰ �共�肩';
-$messages['servererror'] = '��罹ｲ� �乱�洳!';
-$messages['servererrormsg'] = '��罹ｲ� �乱�洳: $msg';
-$messages['dberror'] = '�魂�擽�┣�ｲ��擽�侃 �乱�洳!';
+$messages['servererror'] = '��罹ｲ� �丶�･�!';
+$messages['servererrormsg'] = '��罹ｲ� �丶�･�: $msg';
+$messages['dberror'] = '�魂�擽�┣�ｲ��擽�侃 �丶�･�!';
 $messages['requesttimedout'] = '�囈�ｲｭ �亨�ｰ� �ｴ一ｳｼ';
-$messages['errorreadonly'] = '�ｪ���ｹ�揆 ��倆哩�腹 ��� �螺�慣�笈�共. �攷�ｸｰ����圸 �抄�鵠.';
-$messages['errornoperm'] = '�ｪ���ｹ�揆 ��倆哩�腹 ��� �螺�慣�笈�共. �ｶ醐復�擽 �ｱｰ�ｶ� �勢.';
-$messages['invalidrequest'] = '�椈�ｪｻ�頗 �囈�ｲｭ! �魂�擽�┣�株 ����棗�据�ｧ� �賦�葺�搆.';
+$messages['errorreadonly'] = '�ｪ���ｹ�揆 ��倆哩�腹 ��� �螺�慣�笈�共. �攷�ｸｰ ����圸 �抄�鵠�桷.';
+$messages['errornoperm'] = '�ｪ���ｹ�揆 ��倆哩�腹 ��� �螺�慣�笈�共. �ｶ醐復�擽 �ｱｰ�ｶ��勢.';
+$messages['erroroverquota'] = '�梠�羅�揆 ��倆哩�腹 ��� �螺�搆. �流�悛 �ｳｵ�ｰ��擽 �螺�搆.';
+$messages['erroroverquotadelete'] = '�流�悛 �ｳｵ�ｰ��擽 �螺�搆. SHIFT-DEL�揆 �擽�圸�葺�流 �ｩ肥亨�ｧ��･ｼ �く��懦葺�┷�囈.';
+$messages['invalidrequest'] = '�椈�ｪｻ�頗 �囈�ｲｭ! �魂�擽�┣�ｰ� ����棗�据�ｧ� �賦�葺�搆.';
 $messages['invalidhost'] = '�椈�ｪｻ�頗 ��罹ｲ� �擽�ｦ��桿�笈�共.';
-$messages['nomessagesfound'] = '�擽 �ｩ肥攵�物�乱 �ｩ肥攵�擽 �螺�慣�笈�共';
-$messages['loggedout'] = '�┷��們揆 �┳�ｳｵ����愍�｡� �｢��｣醐葺����慣�笈�共. �譜��倣梭 �ｰ��強�亨�丶!';
-$messages['mailboxempty'] = '�ｩ肥攵�物�擽 �ｹ��牟�梭�慣�笈�共';
-$messages['refreshing'] = '�ヨ�｡懋ｳ��ｹｨ �､� ...';
+$messages['nomessagesfound'] = '�擽 �ｩ肥攵�物�乱 �ｩ肥攵�擽 �螺�慣�笈�共.';
+$messages['loggedout'] = '�┷��們揆 �┳�ｳｵ����愍�｡� �｢��｣醐葺����慣�笈�共. �譜��倣梭 �ｰ��┷�囈!';
+$messages['mailboxempty'] = '�ｩ肥攵�物�擽 �ｹ��牟�梭�慣�笈�共.';
+$messages['refreshing'] = '�ヨ�｡� �ｳ��ｹ俯株 �､� ...';
 $messages['loading'] = '�ｶ壱洳�丶�株 �､�...';
-$messages['uploading'] = '�葺�ｘ�攪 �血�攵 �豫�ｦｬ�ｸｰ...';
-$messages['uploadingmany'] = '�流�洳 �血�攵 �豫�ｦｬ�ｸｰ...';
-$messages['loadingdata'] = '�魂�擽�┣ �ｶ壱洳�丶�株 �､�...';
-$messages['checkingmail'] = '�ヨ �ｩ肥攵 �剳�攤 �､�...';
-$messages['sendingmessage'] = '�ｩ肥攵 �ｳｴ�ざ�株 �､�...';
-$messages['messagesent'] = '�ｩ肥攵�揆 �┳�ｳｵ����愍�｡� �ｳｴ�ヨ�慣�笈�共';
-$messages['savingmessage'] = '�ｩ肥攵 ����棗 �､�...';
-$messages['messagesaved'] = '�ｩ肥攵�擽 �糖�椈�売�敢 �抄�鵠�乱 ����棗�据�来�慣�笈�共';
-$messages['successfullysaved'] = '�┳�ｳｵ����愍�｡� ����棗';
-$messages['addedsuccessfully'] = '�硫�攷�ｲ俾ｰ� �｣ｼ��誤｡晧乱 �┳�ｳｵ����愍�｡� �ｶ緋ｰ��据�来�慣�笈�共';
-$messages['contactexists'] = '�擽 �ｩ肥攵�｡� �ｧ���簿頗 �硫�攷�ｲ俾ｰ� �擽�ｯｸ �梭�慣�笈�共';
-$messages['contactnameexists'] = '�擽�ｯｸ �｡ｴ�椪�葺�株 �ｲ��ｳｼ �徐�攵�復 �擽�ｦ��攪 �硫�攷�ｲ�.';
-$messages['blockedimages'] = '�ｳｴ�譜 �悛�ｧ��･ｼ �怱�紛, �擽 �ｩ肥攵�攪 �匣�ｶ� �擽�ｯｸ�ｧ��･ｼ �ｰｨ�卿�葺����慣�笈�共';
-$messages['encryptedmessage'] = '�擽 �ｩ肥攵�捩 �部�从�剩�据�牟 �ｳｼ ��� �螺�慣�笈�共. �｣���｡�鮒�笈�共!';
-$messages['nocontactsfound'] = '�硫�攷�ｲ� �螺�搆';
-$messages['contactnotfound'] = '�囈�ｲｭ�復 �硫�攷�ｲ俾ｰ� �螺�慣�笈�共';
-$messages['contactsearchonly'] = '�硫�攷�ｲ俯･ｼ �ｰｾ�ｸｰ �怱�紛 �ｲ��ラ �墳�ｪｩ�揆 �桿��･�葺�┷�囈.';
-$messages['sendingfailed'] = '�ｩ肥攵�揆 �ｳｴ�ざ�ｧ� �ｪｻ�毎�慣�笈�共';
-$messages['senttooquickly'] = '�擽 �ｩ肥亨�ｧ��･ｼ �ｳｴ�ざ�ｸｰ ����乱 $sec �ｴ� �徐�譜 �ｸｰ�共�ｦｬ�強�亨�丶.';
-$messages['errorsavingsent'] = '�ｳｴ�ず �ｩ肥亨�ｧ��･ｼ ����棗�腹 �阜 �乱�洳�ｰ� �ｰ懍�晨毎�慣�笈�共.';
-$messages['errorsaving'] = '����棗 �､� �乱�洳�ｰ� �ｰ懍�晨毎�慣�笈�共';
-$messages['errormoving'] = '�ｩ肥攵�揆 �舒�ｸｸ ��� �螺�慣�笈�共';
-$messages['errorcopying'] = '�ｩ肥亨�ｧ�(�豆)�･ｼ �ｳｵ�ぎ�腹 ��� �螺�慣�笈�共.';
-$messages['errordeleting'] = '�ｩ肥攵�揆 �ｧ��垪 ��� �螺�慣�笈�共';
-$messages['errormarking'] = '�ｩ肥亨�ｧ�(�豆)�乱 �像�亨�腹 ��� �螺�慣�笈�共.';
-$messages['deletecontactconfirm']  = '��簿ｧ� �│��晨復 �硫�攷�ｲ俯豆�揆 �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
-$messages['deletegroupconfirm']  = '��簿ｧ尖｡� �│��晨復 �ｷｸ�｣ｹ�揆 �く��懦葺�株 �ｲ��揆 �寳�葺�強�笈�ｹ�?';
-$messages['deletemessagesconfirm'] = '��簿ｧ� �│��晨復 �ｩ肥攵�豆�揆 �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
-$messages['deletefolderconfirm']  = '��簿ｧ� �擽 �抄�鵠�･ｼ �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
-$messages['purgefolderconfirm']  = '��簿ｧ� �擽 �抄�鵠�攪 �ｪｨ�蕩 �ｩ肥攵�揆 �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
-$messages['contactdeleting'] = '�硫�攷�ｲ�(�豆) �く��� �､�...';
+$messages['uploading'] = '�血�攵�揆 �羅�｡罹糖�葺�株 �､�...';
+$messages['uploadingmany'] = '�血�攵�揆 �羅�｡罹糖�葺�株 �､�...';
+$messages['loadingdata'] = '�魂�擽�┣�･ｼ �ｶ壱洳�丶�株 �､�...';
+$messages['checkingmail'] = '�ヨ �ｩ肥亨�ｧ��･ｼ �剳�攤�葺�株 �､�...';
+$messages['sendingmessage'] = '�ｩ肥亨�ｧ��･ｼ �ｳｴ�ざ�株 �､�...';
+$messages['messagesent'] = '�ｩ肥亨�ｧ��･ｼ �┳�ｳｵ����愍�｡� �ｳｴ�ヨ�慣�笈�共.';
+$messages['savingmessage'] = '�ｩ肥亨�ｧ��･ｼ ����棗�葺�株 �､�...';
+$messages['messagesaved'] = '�ｩ肥亨�ｧ��ｰ� �桷�亨 �ｳｴ�ｴ��物�乱 ����棗�据�来�慣�笈�共.';
+$messages['successfullysaved'] = '�┳�ｳｵ����愍�｡� ����棗�勢.';
+$messages['addedsuccessfully'] = '�硫�攷�ｲ俾ｰ� �｣ｼ��誤｡晧乱 �┳�ｳｵ����愍�｡� �ｶ緋ｰ��据�来�慣�笈�共.';
+$messages['contactexists'] = '�硫�攷�ｲ們乱 �徐�攵�復 �擽�ｩ肥攵 �｣ｼ��語ｰ� �擽�ｯｸ �｡ｴ�椪�鮒�笈�共.';
+$messages['contactnameexists'] = '�硫�攷�ｲ們乱 �徐�攵�復 �擽�ｦ��擽 �擽�ｯｸ �｡ｴ�椪�鮒�笈�共.';
+$messages['blockedimages'] = '�ｳｴ�譜�揆 �怱�紛, �擽 �ｩ肥亨�ｧ��攪 �匣�ｶ� �擽�ｯｸ�ｧ��･ｼ �ｰｨ�卿�葺����慣�笈�共.';
+$messages['encryptedmessage'] = '�擽�ｲ��捩 �部�从�剩�頗 �ｩ肥亨�ｧ��ｩｰ �像�亨�腹 ��� �螺�慣�笈�共. �｣���｡�鮒�笈�共!';
+$messages['nocontactsfound'] = '�硫�攷�ｲ俯･ｼ �ｰｾ�揆 ��� �螺�搆.';
+$messages['contactnotfound'] = '�囈�ｲｭ�復 �硫�攷�ｲ俯･ｼ �ｰｾ�揆 ��� �螺�来�慣�笈�共.';
+$messages['contactsearchonly'] = '�硫�攷�ｲ俯･ｼ �ｰｾ�ｸｰ �怱�紛 �攵�ｶ� �ｲ��ラ�圸�牟�･ｼ �桿��･�葺�┷�囈.';
+$messages['sendingfailed'] = '�ｩ肥亨�ｧ� �ｳｴ�ざ�ｸｰ�･ｼ �共�肩�葺����搆.';
+$messages['senttooquickly'] = '�擽 �ｩ肥亨�ｧ��･ｼ �ｳｴ�ざ�ｸｰ ����乱 $sec�ｴ� �徐�譜 �ｸｰ�共�ｦｬ�┷�囈.';
+$messages['errorsavingsent'] = '�ｳｴ�ず �ｩ肥亨�ｧ��･ｼ ����棗�葺�株 �徐�譜 �丶�･俾ｰ� �ｰ懍�晨毎�慣�笈�共.';
+$messages['errorsaving'] = '����棗 �､� �丶�･俾ｰ� �ｰ懍�晨毎�慣�笈�共.';
+$messages['errormoving'] = '�ｩ肥亨�ｧ��･ｼ �擽�徐�腹 ��� �螺�来�搆.';
+$messages['errorcopying'] = '�ｩ肥亨�ｧ��･ｼ �ｳｵ�ぎ�腹 ��� �螺�来�搆.';
+$messages['errordeleting'] = '�ｩ肥亨�ｧ��･ｼ �く��懦腹 ��� �螺�来�搆.';
+$messages['errormarking'] = '�ｩ肥亨�ｧ��･ｼ �像�亨�腹 ��� �螺�来�搆.';
+$messages['deletecontactconfirm']  = '��簿ｧ� �│��晨復 �硫�攷�ｲ俯･ｼ �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['deletegroupconfirm']  = '��簿ｧ尖｡� �│��晨復 �ｷｸ�｣ｹ�揆 �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['deletemessagesconfirm'] = '��簿ｧ尖｡� �│��晨復 �ｩ肥亨�ｧ��･ｼ �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['deletefolderconfirm']  = '��簿ｧ尖｡� �擽 �抄�鵠�･ｼ �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['purgefolderconfirm']  = '��簿ｧ尖｡� �擽 �抄�鵠�攪 �ｪｨ�蕩 �ｩ肥亨�ｧ��･ｼ �く��懦葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['contactdeleting'] = '�硫�攷�ｲ� �く��� �､�...';
 $messages['groupdeleting'] = '�ｷｸ�｣ｹ �く��� �､�...';
-$messages['folderdeleting'] = '�抄�鵠 �ｧ��垈�株 �､�...';
-$messages['foldermoving'] = '�抄�鵠 �舒�ｸｰ�株 �､�...';
-$messages['foldersubscribing'] = '�抄�鵠�攪 �ｵｬ�遵�揆 �劈�┳�剩 �葺�株 �､�...';
+$messages['folderdeleting'] = '�抄�鵠�･ｼ �く��懦葺�株 �､�...';
+$messages['foldermoving'] = '�抄�鵠�･ｼ �擽�徐�葺�株 �､�...';
+$messages['foldersubscribing'] = '�抄�鵠�･ｼ �ｵｬ�遵�葺�株 �､�...';
 $messages['folderunsubscribing'] = '�抄�鵠�攪 �ｵｬ�遵�揆 �ｷｨ��醐葺�株 �､�...';
-$messages['formincomplete'] = '�桝�享�揆 �刋����梭 �ｱ��垈�ｧ� �賦�葺�慣�笈�共';
-$messages['noemailwarning'] = '�悛�圷�復 �擽�ｩ肥攵 �｣ｼ��誤･ｼ �┘�牟�｣ｼ�強�亨�丶';
-$messages['nonamewarning']  = '�擽�ｦ��揆 �┘�牟�｣ｼ�強�亨�丶';
-$messages['nopagesizewarning'] = '�侍�擽�ｧ� �〓�ｸｰ�･ｼ �┘�牟�｣ｼ�強�亨�丶';
-$messages['nosenderwarning'] = '�ｰ懍侠�梵 �擽�ｩ肥攵 �｣ｼ��誤･ｼ �┘�牟�｣ｼ�強�亨�丶';
-$messages['norecipientwarning'] = '����牟�巡 �復 �ｰ� �擽�メ�攪 ��們侠 �｣ｼ��誤･ｼ �┘�牟�｣ｼ�強�亨�丶';
-$messages['nosubjectwarning']  = '"��罹ｪｩ"�擽 �螺�慣�笈�共. ��罹ｪｩ�揆 �┘�愍�亨�ｲ��慣�笈�ｹ�?';
-$messages['nobodywarning'] = '��作侃�敢 �螺�擽 �ｩ肥攵�揆 �ｳｴ�ぞ�ｹ護囈?';
-$messages['notsentwarning'] = '�ｩ肥攵�揆 �ｳｴ�ざ�ｧ� �賦�葺�慣�笈�共. �ｩ肥攵�揆 �ｲ��ｦｬ�亨�ｲ��慣�笈�ｹ�?';
-$messages['noldapserver'] = '�ｲ��ラ�腹 LDAP ��罹ｲ��･ｼ �│��晨葺�┷�囈';
-$messages['nosearchname'] = '�硫�攷�ｲ� �擽�ｦ��擽�ｘ �ｩ肥攵 �｣ｼ��誤･ｼ �┘�愍�┷�囈';
-$messages['notuploadedwarning'] = '�符�ｧ� �ｪｨ�蕩 �ｲｨ�ｶ��ｰ� �羅�｡罹糖�据�ｧ� �賦�葺�慣�笈�共. �ｸｰ�共�ｦｬ�ｱｰ�ｘ �羅�｡罹糖�･ｼ �ｷｨ��醐葺�ｸｰ �ｰ罷檮�笈�共.';
-$messages['searchsuccessful'] = '$nr�ｰ懍攪 �ｩ肥攵 �ｰ懋ｲｬ';
-$messages['contactsearchsuccessful'] = '$nr �硫�攷�ｲ� �ｰ懋ｲｬ�勢.';
-$messages['searchnomatch'] = '�ｲ��ラ �ｲｰ�ｳｼ�ｰ� �螺�慣�笈�共';
+$messages['formincomplete'] = '�桝�享�揆 �刋����梭 �梠�┳�据�ｧ� �賦�葺�慣�笈�共.';
+$messages['noemailwarning'] = '�悛�圷�復 �擽�ｩ肥攵 �｣ｼ��誤･ｼ �桿��･�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['nonamewarning']  = '�擽�ｦ��揆 �桿��･�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['nopagesizewarning'] = '�侍�擽�ｧ� �〓�ｸｰ�･ｼ �桿��･�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['nosenderwarning'] = '�ｰ懍侠�攤 �擽�ｩ肥攵 �｣ｼ��誤･ｼ �桿��･�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['norecipientwarning'] = '����牟�巡 �復 �ｰ� �擽�メ�攪 ��們侠�攤 �｣ｼ��誤･ｼ �桿��･�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['nosubjectwarning']  = '"��罹ｪｩ" �符�糖�ｰ� �ｹ��牟�梭�慣�笈�共. �ｧ��ｸ� �桿��･�葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['nobodywarning'] = '��作侃�敢�ｰ� �螺�株 �ｩ肥亨�ｧ��･ｼ �ｳｴ�ざ�亨�ｲ��慣�笈�ｹ�?';
+$messages['notsentwarning'] = '�ｩ肥亨�ｧ��･ｼ �ｳｴ�ざ�ｧ� �ｪｻ�毎�慣�笈�共. �ｩ肥亨�ｧ��･ｼ �署�ｸｰ�葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['noldapserver'] = '�ｲ��ラ�腹 LDAP ��罹ｲ��･ｼ �│��晨葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['nosearchname'] = '�硫�攷�ｲ俯ｪ��擽�ｘ �擽�ｩ肥攵 �｣ｼ��誤･ｼ �桿��･�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['notuploadedwarning'] = '�符�ｧ� �ｪｨ�蕩 �ｲｨ�ｶ��ｰ� �羅�｡罹糖�据�ｧ� �賦�葺�慣�笈�共. �ｸｰ�共�ｦｬ�ｱｰ�ｘ �羅�｡罹糖�･ｼ �ｷｨ��醐葺�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['searchsuccessful'] = '$nr�ｰ懍攪 �ｩ肥亨�ｧ��･ｼ �ｰｾ�搆.';
+$messages['contactsearchsuccessful'] = '$nr�ｰ懍攪 �硫�攷�ｲ俯･ｼ �ｰｾ�搆.';
+$messages['searchnomatch'] = '�ｲ��ラ�擽 �攵�ｹ� �墳�ｪｩ�揆 �ｰｾ�ｧ� �ｪｻ�物.';
 $messages['searching'] = '�ｲ��ラ �､�...';
-$messages['checking'] = '�ｲｴ�〓 �､�...';
-$messages['nospellerrors'] = '�侃�滋�ｧ� �乱�洳�ｰ� �螺�慣�笈�共';
-$messages['folderdeleted'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� �く��懦葺����慣�笈�共';
-$messages['foldersubscribed'] = '�抄�鵠�ｰ� �┳�ｳｵ����愍�｡� �ｵｬ�遵 �勢.';
-$messages['folderunsubscribed'] = '�抄�鵠�ｰ� �┳�ｳｵ����愍�｡� �ｵｬ�遵 �ｷｨ��� �勢.';
-$messages['folderpurged'] = '�抄�鵠�ｰ� �┳�ｳｵ����愍�｡� �ｹ��寥�｡護慣�笈�共.';
-$messages['folderexpunged'] = '�抄�鵠�ｰ� �┳�ｳｵ����愍�｡� �封�ｶ� �据�来�慣�笈�共.';
-$messages['deletedsuccessfully'] = '�┳�ｳｵ����愍�｡� �く��懦葺����慣�笈�共';
-$messages['converting'] = '�ｩ肥攵�攪 �小�ｧｷ�揆 �ｧ��垈�株 �､�...';
-$messages['messageopenerror'] = '��罹ｲ��乱��� �ｩ肥攵�揆 �ｰ���ｸ�豫 ��� �螺�慣�笈�共';
-$messages['fileuploaderror'] = '�血�攵 �羅�｡罹糖 �共�肩';
-$messages['filesizeerror'] = '�豫�ｦｰ �血�攵�擽 $size�攪 �ｵ罹劇 �〓�ｸｰ�･ｼ �ｴ一ｳｼ�毎�慣�笈�共';
-$messages['copysuccess'] = '$nr�ｰ懍攪 �｣ｼ��誤･ｼ �┳�ｳｵ����愍�｡� �ｳｵ�ぎ�毎�慣�笈�共';
-$messages['copyerror'] = '�｣ｼ��誤･ｼ �ｳｵ�ぎ�腹 ��� �螺�慣�笈�共';
-$messages['sourceisreadonly'] = '�擽 �｣ｼ��� ��護侃�株 �攷�ｸｰ ����圸�桿�笈�共';
-$messages['errorsavingcontact'] = '�硫�攷�ｲ� �｣ｼ��誤･ｼ ����棗�腹 ��� �螺�慣�笈�共';
-$messages['movingmessage'] = '�ｩ肥亨�ｧ� �擽�徐 �､�...';
-$messages['copyingmessage'] = '�ｩ肥亨�ｧ�(�豆) �ｳｵ�ぎ �､�...';
-$messages['copyingcontact'] = '�硫�攷�ｲ�(�豆) �ｳｵ�ぎ �､�...';
-$messages['deletingmessage'] = '�ｩ肥亨�ｧ�(�豆) �く��� �､�...';
-$messages['markingmessage'] = '�ｩ肥亨�ｧ�(�豆)�乱 �像�亨 �､�...';
-$messages['addingmember'] = '�ｷｸ�｣ｹ�乱 �硫�攷�ｲ�(�豆)�揆 �ｶ緋ｰ� �､�...';
-$messages['removingmember'] = '�ｷｸ�｣ｹ�愍�｡� �ｶ��┣ �硫�攷�ｲ俯･ｼ �く��� �､�...';
-$messages['receiptsent'] = '�ｩ肥攵 �攷�搆 �剳�攤�揆 �ｳｴ�ヨ�慣�笈�共';
-$messages['errorsendingreceipt'] = '�攷�搆 �剳�攤�揆 �ｳｴ�ぞ ��� �螺�慣�笈�共';
+$messages['checking'] = '�剳�攤 �､�...';
+$messages['nospellerrors'] = '�ｧ樌ｶ､�ｲ� �丶�･俯･ｼ �ｰｾ�ｧ� �ｪｻ�物.';
+$messages['folderdeleted'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� �く��懦物.';
+$messages['foldersubscribed'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� �ｵｬ�遵�物.';
+$messages['folderunsubscribed'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� �ｵｬ�遵 �ｷｨ��醐物.';
+$messages['folderpurged'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� �ｹ��屏�慣�笈�共.';
+$messages['folderexpunged'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� �封�ｶ倣葺����慣�笈�共.';
+$messages['deletedsuccessfully'] = '�┳�ｳｵ����愍�｡� �く��懦物.';
+$messages['converting'] = '��懍享 �└��� �く��� �､�...';
+$messages['messageopenerror'] = '��罹ｲ��乱��� �ｩ肥亨�ｧ��･ｼ �ｶ壱洳�豫 ��� �螺�搆.';
+$messages['fileuploaderror'] = '�血�攵 �羅�｡罹糖�･ｼ �共�肩�物.';
+$messages['filesizeerror'] = '�羅�｡罹糖�頗 �血�攵�擽 �ｵ罹劇 �〓�ｸｰ�攤 $size�･ｼ �ｴ一ｳｼ�葺����慣�笈�共.';
+$messages['copysuccess'] = '$nr�ｰ懍攪 �｣ｼ��誤･ｼ �┳�ｳｵ����愍�｡� �ｳｵ�ぎ�物.';
+$messages['copyerror'] = '�ｪｨ�蕩 �｣ｼ��誤･ｼ �ｳｵ�ぎ�腹 ��� �螺�搆.';
+$messages['sourceisreadonly'] = '�擽 �｣ｼ��護攪 ��護侃�株 �攷�ｸｰ ����圸�桿�笈�共.';
+$messages['errorsavingcontact'] = '�硫�攷�ｲ們攪 �｣ｼ��誤･ｼ ����棗�腹 ��� �螺�搆.';
+$messages['movingmessage'] = '�ｩ肥亨�ｧ��･ｼ �擽�徐�葺�株 �､�...';
+$messages['copyingmessage'] = '�ｩ肥亨�ｧ� �ｳｵ�ぎ�葺�株 �､�...';
+$messages['copyingcontact'] = '�硫�攷�ｲ� �ｳｵ�ぎ�葺�株 �､�...';
+$messages['deletingmessage'] = '�ｩ肥亨�ｧ� �く��懦葺�株 �､�...';
+$messages['markingmessage'] = '�ｩ肥亨�ｧ��乱 �像�亨�葺�株 �､�...';
+$messages['addingmember'] = '�ｷｸ�｣ｹ�乱 �硫�攷�ｲ俯･ｼ �ｶ緋ｰ��葺�株 �､�...';
+$messages['removingmember'] = '�ｷｸ�｣ｹ�乱��� �硫�攷�ｲ俯･ｼ �く��懦葺�株 �､�...';
+$messages['receiptsent'] = '�攷�搆 �剳�攤�揆 �ｳｴ�ヤ.';
+$messages['errorsendingreceipt'] = '�攷�搆 �剳�攤�揆 �ｳｴ�ぞ ��� �螺�搆.';
 $messages['deleteidentityconfirm'] = '�擽 �墳�ｪｩ�揆 ��簿ｧ尖｡� �く��� �葺�亨�ｲ��慣�笈�ｹ�?';
-$messages['nodeletelastidentity'] = '�擽 ��簿ｳｴ�株 �ｧ溢ｧ��ｧ� �お�捩 �ｲ��擽�ｯ��｡� �ｧ��垪 ��� �螺�慣�笈�共';
-$messages['forbiddencharacter'] = '�抄�鵠 �擽�ｦ��乱 �萄 ��� �螺�株 �ｬｸ�梵�ｰ� �小�物�据�牟 �梭�慣�笈�共';
-$messages['selectimportfile'] = '�羅�｡罹糖�腹 �血�攵�揆 �│��晨葺�┷�囈';
-$messages['addresswriterror'] = '�│��晨復 �｣ｼ��誤｡晧捩 �萄 ��� �螺�慣�笈�共';
-$messages['contactaddedtogroup'] = '�擽 �ｷｸ�｣ｹ�乱 �硫�攷�ｲ俯･ｼ �┳�ｳｵ����愍�｡� �ｶ緋ｰ� �物.';
-$messages['contactremovedfromgroup'] = '�擽 �ｷｸ�｣ｹ�愍�｡� �ｶ��┣ �硫�攷�ｲ俯･ｼ �┳�ｳｵ����愍�｡� ��懋ｱｰ �物.';
-$messages['nogroupassignmentschanged'] = '�ｷｸ�｣ｹ �腹�胸�揆 �ｳ��ｲｽ�葺�ｧ� �ｪｻ�毎�慣�笈�共.';
-$messages['importwait'] = '�ｰ���ｸ�丶�株 �､�, �ｸｰ�共�ｦｬ�┷�囈...';
-$messages['importformaterror'] = '�ｰ���ｸ �丶�ｸｰ �共�肩! �羅�｡罹糖 �復 �血�攵�捩 �ｰ���ｸ�豫 ��� �螺�株 �魂�擽�┣ �血�攵�桿�笈�共.';
-$messages['importconfirm'] = '<b>$inserted �硫�攷�ｲ俯･ｼ �┳�ｳｵ����愍�｡� �ｰ���ｸ�剩�ｳ�, $skipped �｡ｴ�椪�葺�株 �墳�ｪｩ�捩 �ｱｴ�ц�峅�来�慣�笈�共.</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>$skipped �ｱｴ�攪 �ｸｰ�｡ｴ �墳�ｪｩ�揆 �ｱｴ�ц �怙.</ b>';
-$messages['opnotpermitted'] = '�梠�羅�擽 �来�ｰ��据�ｧ� �賦�葺�慣�笈�共!';
-$messages['nofromaddress'] = '�│��晨復 �侠�寳�乱 �擽�ｩ肥攵 �｣ｼ��語ｰ� �螺�搆';
-$messages['editorwarning'] = '�攵�ｰ� ��作侃�敢 �失�ｧ滝ｸｰ�｡� �ｰ緋ｾｸ�ｩｴ �ｪｨ�蕩 ��懍享�擽 �ぎ�攵�ｧ瀧笈�共. �ｳ���削腹�ｹ護囈?';
-$messages['httpreceivedencrypterror'] = '�ｹ俯ｪ�����攤 �└��� �丶�･俾ｰ� �ｰ懍�� �据�来�搆. �ｴ��ｦｬ�梵�乱�ｲ� �ｰ罷｡� �硫�攷�揆 �ｷｨ�葺�┷�囈.<b>�ｩ肥亨�ｧ��･ｼ �����｡�腹 ��� �螺�慣�笈�共.</b>';
-$messages['smtpconnerror'] = 'SMTP �乱�洳 ($code): ��罹ｲ��｡懍攪 �硫�ｲｰ�擽 �共�肩 �勢.';
-$messages['smtpautherror'] = 'SMTP �乱�洳 ($code): �攤�ｦ晧擽 �共�肩 �勢.';
-$messages['smtpfromerror'] = 'SMTP �乱�洳 ($code): �ｳｴ�ず �ぎ�梃�揆 "$from"�｡� �└��倣葺�株 �ｲ��擽 �共�肩 �勢 ($msg).';
-$messages['smtptoerror'] = 'SMTP �乱�洳 ($code): ��們侠�梵 "$to"�･ｼ �ｶ緋ｰ��葺�株 �魂 �共�肩 �物 ($msg).';
-$messages['smtprecipientserror'] = 'SMTP �乱�洳: ��們侠�梵 �ｪｩ�｡晧揆 �ｶ����(parse)�腹 ��� �螺�搆.';
-$messages['smtperror'] = 'SMTP �乱�洳: $msg';
-$messages['emailformaterror'] = '�椈�ｪｻ�頗 e-mail �｣ｼ���: $email';
-$messages['toomanyrecipients'] = '��們侠�梵�ｰ� �ц�ｬｴ �ｧ珠慣�笈�共. ��們侠�梵�攪 ��俯･ｼ $max�｡� �､��擽�┷�囈.';
-$messages['maxgroupmembersreached'] = '�ｷｸ�｣ｹ �ｵｬ�┳�寳�攪 ��俾ｰ� �ｵ罹劇 �攤�寳 $max�･ｼ �ｴ一ｳｼ�葺����慣�笈�共.';
-$messages['internalerror'] = '�ざ�ｶ� �丶�･俾ｰ� �ｰ懍�晨葺����慣�笈�共. �共�亨 �亨�巡�葺�ｸｰ �ｰ罷檮�笈�共.';
-$messages['contactdelerror'] = '�硫�攷�ｲ�(�豆)�揆 �ｧ��垪 ��� �螺�慣�笈�共.';
-$messages['contactdeleted'] = '�硫�攷�ｲ�(�豆)�擽 �┳�ｳｵ����愍�｡� ��懋ｱｰ �勢.';
-$messages['contactrestoreerror'] = '�く��罹頗 �硫�攷�ｲ�(�豆)�揆 �ｳｵ�ｵｬ�腹 ��� �螺�搆.';
-$messages['contactrestored'] = '�硫�攷�ｲ�(�豆)�擽 �┳�ｳｵ����愍�｡� �ｳｵ�ｵｬ �勢.';
-$messages['groupdeleted'] = '�ｷｸ�｣ｹ�擽 �┳�ｳｵ����愍�｡� �く��� �勢.';
-$messages['grouprenamed'] = '�ｷｸ�｣ｹ�ｪ��擽 �┳�ｳｵ����愍�｡� �ｳ��ｲｽ �勢.';
-$messages['groupcreated'] = '�ｷｸ�｣ｹ�擽 �┳�ｳｵ����愍�｡� ��晧┳ �勢.';
-$messages['savedsearchdeleted'] = '����棗 �復 �ｲ��ラ ��簿ｳｴ�･ｼ �く��懦毎�慣�笈�共.';
-$messages['savedsearchdeleteerror'] = '����棗 �復 �ｲ��ラ ��簿ｳｴ�･ｼ �く��懦腹 ��� �螺�慣�笈�共.';
-$messages['savedsearchcreated'] = '�ｲ��ラ ��簿ｳｴ�･ｼ �ｧ誤豆�来�慣�笈�共.';
-$messages['savedsearchcreateerror'] = '�ｲ��ラ ��簿ｳｴ�･ｼ �く��懦腹 ��� �螺�慣�笈�共.';
-$messages['messagedeleted'] = '�ｩ肥亨�ｧ�(�豆)�擽 �┳�ｳｵ����愍�｡� �く��� �勢.';
-$messages['messagemoved'] = '�ｩ肥亨�ｧ�(�豆)�揆 �┳�ｳｵ����愍�｡� �擽�徐 �物.';
-$messages['messagecopied'] = '�ｩ肥亨�ｧ�(�豆)�揆 �┳�ｳｵ����愍�｡� �ｳｵ�ぎ �物.';
-$messages['messagemarked'] = '�ｩ肥亨�ｧ�(�豆)�乱 �┳�ｳｵ����愍�｡� �像�亨 �物.';
-$messages['autocompletechars'] = '�梵�徐 �刋�┳�揆 �怱�紛��� ����牟�巡 $min �ｸ��梵�･ｼ �桿��･�葺�┷�囈.';
-$messages['autocompletemore'] = '�ｧ珠捩 �墳�ｪｩ�擽 �ｰ懋ｲｬ�据�来�慣�笈�共. �鵠 �ｧ珠捩 �ｬｸ�梵�･ｼ �桿��･�葺�┷�囈.';
-$messages['namecannotbeempty'] = '�擽�ｦ��擽 �ｹ��寥��ｸ��罹株 �譜�姓�笈�共.';
+$messages['nodeletelastidentity'] = '�擽 �侠�寳�捩 �ｧ溢ｧ��ｧ� �葺�ｘ�擽�ｯ��｡� �く��懦腹 ��� �螺�慣�笈�共.';
+$messages['forbiddencharacter'] = '�抄�鵠�ｪ��乱 �ｸ溢ｧ��頗 �ｬｸ�梵�ｰ� �小�物�据�牟 �梭�慣�笈�共.';
+$messages['selectimportfile'] = '�羅�｡罹糖�腹 �血�攵�揆 �│��晨紛�｣ｼ�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['addresswriterror'] = '�│��晤頗 �｣ｼ��誤｡晧捩 �堂�ｸｰ�ｰ� �ｶ一ｰ��冠�鮒�笈�共.';
+$messages['contactaddedtogroup'] = '�擽 �ｷｸ�｣ｹ�乱 �硫�攷�ｲ俯･ｼ �┳�ｳｵ����愍�｡� �ｶ緋ｰ��物.';
+$messages['contactremovedfromgroup'] = '�擽 �ｷｸ�｣ｹ�乱��� �硫�攷�ｲ俯･ｼ �┳�ｳｵ����愍�｡� ��懋ｱｰ�物.';
+$messages['nogroupassignmentschanged'] = '�ｷｸ�｣ｹ �腹�胸�擽 �ｳ��ｲｽ�据�ｧ� �賦�搆.';
+$messages['importwait'] = '�ｰ���ｸ�丶�株 �､�, �ｸｰ�共��､�｣ｼ�亨�ｸｰ �ｰ罷檮�笈�共...';
+$messages['importformaterror'] = '�ｰ���ｸ�丶�ｸｰ�･ｼ �共�肩�物! �羅�｡罹糖�頗 �血�攵�捩 �悛�圷�葺�ｧ� �賦�捩 �ｰ���ｸ�丶�ｸｰ �魂�擽�┣ �血�攵�桿�笈�共.';
+$messages['importconfirm'] = '<b>$inserted �硫�攷�ｲ俯･ｼ �┳�ｳｵ����愍�｡� �ｰ���ｸ�亢<b>';
+$messages['importconfirmskipped'] = '<b>�ｸｰ�｡ｴ �ｸｰ�椪�ぎ�墳�攤 $skipped�揆(�･ｼ) �ｱｴ�ц�怙</b>';
+$messages['opnotpermitted'] = '�梠�羅�擽 �来�ｰ��据�ｧ� �賦�搆!';
+$messages['nofromaddress'] = '�│��晤頗 �侠�寳�乱 �擽�ｩ肥攵 �｣ｼ��� �ｰ� ����攷�勢.';
+$messages['editorwarning'] = '�攵�ｰ� ��作侃�敢 �失�ｧ滝ｸｰ�｡� �ｰ緋ｾｸ�ｩｴ �ｪｨ�蕩 ��作侃�敢 ��懍享�擽 �ぎ�攵�ｧ瀧笈�共. �ｳ���削葺�亨�ｲ��慣�笈�ｹ�?';
+$messages['httpreceivedencrypterror'] = '�ｹ俯ｪ�����攤 �ｵｬ�┳ �丶�･俾ｰ� �ｰ懍�晨葺����慣�笈�共. �ｦ餓亨 �ｴ��ｦｬ�梵�乱�ｲ� �硫�攷�葺�┷�囈.
+<b>�ｩ肥亨�ｧ��･ｼ �����｡�腹 ��� �螺�慣�笈�共.</b>';
+$messages['smtpconnerror'] = 'SMTP �丶�･� ($code): ��罹ｲ��凰�攪 �硫�ｲｰ�揆 �共�肩�物.';
+$messages['smtpautherror'] = 'SMTP �乱�洳 ($code): �攤�ｦ晧揆 �共�肩�物.';
+$messages['smtpfromerror'] = 'SMTP �丶�･� ($code): �ｰ懍侠�攤�揆 "$from" ($msg)�｡� �└��倣葺�株�魂 �共�肩�物.';
+$messages['smtptoerror'] = 'SMTP �丶�･� ($code): ��們侠�攤�揆 "$to" ($msg)�乱 �ｶ緋ｰ��葺�株�魂 �共�肩�物.';
+$messages['smtprecipientserror'] = 'SMTP �丶�･�: ��們侠�攤 �ｪｩ�｡晧揆 �ｶ����(parse)�腹 ��� �螺�搆.';
+$messages['smtperror'] = 'SMTP �丶�･�: $msg';
+$messages['emailformaterror'] = '�悛�圷�葺�ｧ� �賦�捩 �擽�ｩ肥攵 �｣ｼ���: $email';
+$messages['toomanyrecipients'] = '��們侠�攤�擽 �ц�ｬｴ �ｧ珠搆. ��們侠�攤 ��俯･ｼ $max�ｪ��愍�｡� �､��擽�┷�囈.';
+$messages['maxgroupmembersreached'] = '�ｷｸ�｣ｹ �ｵｬ�┳�寳�攪 ��俾ｰ� �ｵ罹劇 �攤�寳�攤 $max�ｪ��揆 �ｴ一ｳｼ�鮒�笈�共.';
+$messages['internalerror'] = '�ざ�ｶ� �丶�･俾ｰ� �ｰ懍�晨物. �椪�亨�巡 �紛�｣ｼ�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['contactdelerror'] = '�硫�攷�ｲ俯･ｼ �く��懦腹 ��� �螺�搆.';
+$messages['contactdeleted'] = '�硫�攷�ｲ俾ｰ� �┳�ｳｵ����愍�｡� �く��罹勢.';
+$messages['contactrestoreerror'] = '�く��罹頗 �硫�攷�ｲ俯･ｼ �ｳｵ�ｵｬ�腹 ��� �螺�搆.';
+$messages['contactrestored'] = '�硫�攷�ｲ俾ｰ� �┳�ｳｵ����愍�｡� �ｳｵ�ｵｬ�勢.';
+$messages['groupdeleted'] = '�ｷｸ�｣ｹ�擽 �┳�ｳｵ����愍�｡� �く��罹勢.';
+$messages['grouprenamed'] = '�ｷｸ�｣ｹ�ｪ��擽 �┳�ｳｵ����愍�｡� �ｳ��ｲｽ�勢.';
+$messages['groupcreated'] = '�ｷｸ�｣ｹ�擽 �┳�ｳｵ����愍�｡� ��晧┳�勢.';
+$messages['savedsearchdeleted'] = '����棗�頗 �ｲ��ラ�擽 �┳�ｳｵ����愍�｡� �く��罹勢.';
+$messages['savedsearchdeleteerror'] = '����棗�頗 ��簿ｳｴ�･ｼ �く��懦腹 ��� �螺�来�搆.';
+$messages['savedsearchcreated'] = '����棗�頗 �ｲ��ラ�擽 �┳�ｳｵ����愍�｡� ��晧┳�勢.';
+$messages['savedsearchcreateerror'] = '����棗�頗 �ｲ��ラ�揆 ��晧┳�腹 ��� �螺�来�搆.';
+$messages['messagedeleted'] = '�ｩ肥亨�ｧ��ｰ� �┳�ｳｵ����愍�｡� �く��罹勢.';
+$messages['messagemoved'] = '�ｩ肥亨�ｧ��ｰ� �┳�ｳｵ����愍�｡� �擽�徐�勢.';
+$messages['messagecopied'] = '�ｩ肥亨�ｧ��ｰ� �┳�ｳｵ����愍�｡� �ｳｵ�ぎ�勢.';
+$messages['messagemarked'] = '�ｩ肥亨�ｧ��乱 �┳�ｳｵ����愍�｡� �像�亨�勢.';
+$messages['autocompletechars'] = '�梵�徐 �刋�┳�揆 �怱�紛��� ����牟�巡 $min�ｰ懍攪 �ｬｸ�梵�･ｼ �桿��･�葺�┷�囈.';
+$messages['autocompletemore'] = '�鵠 �ｧ珠捩 �攵�ｹ� �墳�ｪｩ�擽 �ｰ懋ｲｬ�勢. �鵠 �ｧ珠捩 �ｬｸ�梵�･ｼ �桿��･�紛�｣ｼ�亨�ｸｰ �ｰ罷檮�笈�共.';
+$messages['namecannotbeempty'] = '�擽�ｦ��揆 �ｹ��寥�遭 ��� �螺�慣�笈�共.';
 $messages['nametoolong'] = '�擽�ｦ��擽 �ц�ｬｴ �ｹ��笈�共.';
-$messages['folderupdated'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� �ｰｱ�侠 �物.';
-$messages['foldercreated'] = '�抄�鵠�･ｼ �┳�ｳｵ����愍�｡� ��晧┳ �物.';
-$messages['invalidimageformat'] = '�豫�ｰ罷･ｸ �擽�ｯｸ�ｧ� �小�ｩｧ�擽 �符�鋸.';
-$messages['mispellingsfound'] = '�ｩ肥亨�ｧ��乱��� �ｧ樌ｶ､�ｲ� �丶�･俯･ｼ �ｰ川ｧ� �葺����搆.';
-$messages['parentnotwritable'] = '�│��晨復 �ｶ��ｪｨ �抄�鵠�乱 �抄�鵠�･ｼ ��晧┳�葺�ｱｰ�ｘ �擽�徐�腹 ��� �螺�搆. ��滝ｷｼ �ｶ醐復�擽 �螺�搆.';
-$messages['messagetoobig'] = '�ｲ俯ｦｬ�葺�ｸｰ�乱 �ц�ｬｴ ��ｰ �ｩ肥亨�ｧ� �桿�笈�共.';
-$messages['attachmentvalidationerror'] = '�ｲｽ�ｳ�! �擽 �ｲｨ�ｶ� �血�攵�捩 �ｩ肥亨�ｧ��攪 �│�椋 �悛��母ｳｼ �攵�ｹ倆葺�ｧ� �賦�ｸｰ�阜�ｬｸ�乱 �攪�峡�姓�笈�共. �ｳｴ�ず �ぎ�梃�揆 �ｯｿ�揆 ��� �螺�共�ｩｴ, �腐�┳ �ｽ罷糖�･ｼ �小�物�葺�株�ｧ��巡 �ｪｨ�･ｴ�ｸｰ �阜�ｬｸ�乱 �ｸ誤攵�垈����乱��� �龍 ��� �螺�慣�笈�共. <br/><br/><em> ��溢ｸ｡ �復 �｢��･� : $expected; �ｰ懋ｲｬ �復 �｢��･� : $found</ em>';
-$messages['noscriptwarning'] = '�ｲｽ�ｳ�: �擽 �峪 �ｩ肥攵 ��罹ｹ��侃�株 Javascript�ｰ� �符�囈�鮒�笈�共! �ぎ�圸�葺��､�ｩｴ Javascript�･ｼ �ｸ誤攵�垈��� �└��菩乱��� �劈�┳�剩�葺�強�亨�丶.';
+$messages['folderupdated'] = '�抄�鵠�ｰ� �┳�ｳｵ����愍�｡� �羅�魂�擽�敢�勢.';
+$messages['foldercreated'] = '�抄�鵠�ｰ� �┳�ｳｵ����愍�｡� ��晧┳�勢.';
+$messages['invalidimageformat'] = '�悛�圷�復 �擽�ｯｸ�ｧ� ��菩享�擽 �符�鋸.';
+$messages['mispellingsfound'] = '�ｩ肥亨�ｧ��乱��� �ｧ樌ｶ､�ｲ� �丶�･俾ｰ� �ｰ川ｧ��据�来�搆.';
+$messages['parentnotwritable'] = '�│��晨復 �メ�怱 �抄�鵠�乱 �抄�鵠�･ｼ ��晧┳/�擽�徐�腹 ��� �螺�搆. ��滝ｷｼ �ｶ醐復�擽 �螺�搆.';
+$messages['messagetoobig'] = '�ｩ肥亨�ｧ� �ｶ��ｶ��擽 �ｲ俯ｦｬ�葺�ｸｰ�乱�株 �ц�ｬｴ �⊃�笈�共.';
+$messages['attachmentvalidationerror'] = '�ｲｽ�ｳ�! �擽 �ｲｨ�ｶ� �血�攵�攪 �悛��菩擽 �ｩ肥亨�ｧ��乱��� �│�椋�頗 �悛��母ｳｼ �攵�ｹ倆葺�ｧ� �賦�ｸｰ �阜�ｬｸ�乱 �攪�峡�姓�笈�共. �ｰ懍侠�攤�揆 �侠�｢ｰ�腹 ��� �螺�揆 �ｲｽ�垈, �腐�┳ �ｽ罷糖�･ｼ �小�物�腹 ��俯巡 �梭�ｸｰ �阜�ｬｸ�乱 �ｸ誤攵�垈����乱��� �龍�ｧ� �賦�株 �ｲ��擽 �｢駆慣�笈�共. <br/><br/><em> ��溢メ�復 �悛���: $expected; �ｰ懋ｲｬ�頗 �悛���: $found</ em>';
+$messages['noscriptwarning'] = '�ｲｽ�ｳ�: �擽 �峪 �ｩ肥攵 ��罹ｹ��侃�株 �梵�ｰ肥侃�〓�ｦｽ�敢�ｰ� �符�囈�鮒�笈�共! �擽 �ｸｰ�冠�揆 �ぎ�圸�葺�亨��､�ｩｴ �梵�ｰ肥侃�〓�ｦｽ�敢�･ｼ �ｸ誤攵�垈��� �└��菩乱��� �劈�┳�剩�葺�亨�ｸｰ �ｰ罷檮�笈�共.';
 
 ?>
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 0193484a9..a4f6cb568 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiya Karbon';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'bibe...';
 $labels['download'] = 'daxe';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Nexwendﾃｮ';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Peyameke HTML biafirﾃｮne';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ﾅ杪nenava HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Panela berﾃｪ nﾃｮﾅ歛n bide';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index 6783209a3..9d219cbf5 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Di vﾃｪ peyamdankﾃｪ de tu peyam nehat dﾃｮtin';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 2a161824f..6398a3683 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopijuoti';
 $labels['move']     = 'Perkelti';
 $labels['moveto']   = 'Perkelti ﾄｯ窶ｦ';
 $labels['download'] = 'Parsisiﾅｳsti';
+$labels['open']     = 'Atverti';
 $labels['showattachment'] = 'Rodyti';
 $labels['showanyway'] = 'Vistiek rodyti';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'matomus ﾅ｡iame puslapyje';
 $labels['unread'] = 'neskaitytus';
 $labels['flagged'] = 'su gairele';
 $labels['unanswered'] = 'neatsakytus';
+$labels['withattachment'] = 'Su priedu';
 $labels['deleted'] = 'paﾅ｡alintus';
 $labels['undeleted'] = 'Neiﾅ｡trintas';
 $labels['invert'] = 'invertuoti';
@@ -200,10 +202,12 @@ $labels['quicksearch']  = 'Sparﾄ絞oji paieﾅ｡ka';
 $labels['resetsearch']  = 'Atﾅ｡aukti paieﾅ｡kﾄ�';
 $labels['searchmod']  = 'Paieﾅ｡kos modifikatoriai';
 $labels['msgtext']  = 'Visas laiﾅ｡kas';
-$labels['body']  = 'Body';
+$labels['body']  = 'Laiﾅ｡ko tekstas';
 
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiﾅｳsti (.eml)';
+$labels['changeformattext'] = 'Rodyti grynojo teksto formatu';
+$labels['changeformathtml'] = 'Rodyti HTML formatu';
 
 // message compose
 $labels['editasnew']      = 'Redaguoti kaip naujﾄ�';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Raﾅ｡yti laiﾅ｡kﾄ�';
 $labels['contactsfromto'] = 'Adresatai nuo $from iki $to iﾅ｡ $count';
 $labels['print']          = 'Spausdinti';
 $labels['export']         = 'Eksportuoti';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Eksportuoti visus';
+$labels['exportsel']      = 'Eksportuoti paﾅｾymﾄ葉us';
 $labels['exportvcards']   = 'Eksportuoti adresatus  窶柧Card窶� formatu';
 $labels['newcontactgroup'] = 'Kurti adresatﾅｳ grupﾄ�';
 $labels['grouprename']    = 'Pervardinti grupﾄ�';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Laiﾅ｡kus kurti HTML formatu';
 $labels['htmlonreply'] = 'tik atsakymus ﾄｯ HTML formato laiﾅ｡kus';
 $labels['htmlonreplyandforward'] = 'atsakant ﾄｯ HTML laiﾅ｡kﾄ� arba jﾄｯ persiunﾄ絞ant';
 $labels['htmlsignature'] = 'HTML paraﾅ｡as';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Rodyti laiﾅ｡ko perﾅｾiﾅｫros polangﾄｯ';
 $labels['skin'] = 'Grafinis apvalkalas';
 $labels['logoutclear'] = 'Iﾅ｡valyti ﾅ�iukﾅ｡linﾄ� atsijungiant';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Paﾅ｡alinti cituojamame laiﾅ｡ke esantﾄｯ paraﾅ｡
 $labels['autoaddsignature'] = 'Automatiﾅ｡kai pridﾄ葉i paraﾅ｡ﾄ�';
 $labels['newmessageonly'] = 'tik naujuose laiﾅ｡kuose';
 $labels['replyandforwardonly'] = 'tik atsakymuose ir persiunﾄ絞amuose laiﾅ｡kuose';
-$labels['replysignaturepos'] = 'Atsakant ir persiunﾄ絞ant laiﾅ｡kus, paraﾅ｡ﾄ� pridﾄ葉i';
-$labels['belowquote'] = 'po citata';
-$labels['abovequote'] = 'virﾅ｡ citatos';
 $labels['insertsignature'] = 'Pridﾄ葉i paraﾅ｡ﾄ�';
 $labels['previewpanemarkread']  = 'Perﾅｾiﾅｫros polangyje parodytus laiﾅ｡kus ﾅｾymﾄ葉i skaitytais';
 $labels['afternseconds']  = 'praﾄ曜us $n sek.';
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index 6a8e00239..df19c291b 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Duomenﾅｳ bazﾄ耀 klaida!';
 $messages['requesttimedout'] = 'Baigﾄ耀i uﾅｾklausai skirtas laikas';
 $messages['errorreadonly'] = 'Nepavyko atlikti veiksmo 窶� aplankas prieinamas tik skaitymui.';
 $messages['errornoperm'] = 'Nepavyko atlikti veiksmo 窶� nepakanka teisiﾅｳ.';
+$messages['erroroverquota'] = 'Nepavyko atlikti veiksmo. Diske trﾅｫksta laisvos vietos.';
+$messages['erroroverquotadelete'] = 'Diske trﾅｫksta laisvos vietos. Laiﾅ｡kui paﾅ｡alinti naudokite Lyg2+ﾅ�al (Shift+Del) klaviﾅ｡ﾅｳ kombinacijﾄ�.';
 $messages['invalidrequest'] = 'Netinkama uﾅｾklausa! Duomenys neiﾅ｡saugoti.';
 $messages['invalidhost'] = 'Negalimas serverio vardas.';
 $messages['nomessagesfound'] = 'ﾅ�ioje paﾅ｡to dﾄ稜ｾutﾄ曜e laiﾅ｡kﾅｳ nﾄ羊a.';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index 5e47b1a29..7d4de2564 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopﾄ鍍';
 $labels['move']     = 'Pﾄ〉vietot';
 $labels['moveto']   = 'pﾄ〉vietot uz...';
 $labels['download'] = 'lejupielﾄ‥ﾄ鍍';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Paﾅ｡reizﾄ屠ﾄ� lapa';
 $labels['unread'] = 'nelasﾄｫtﾄ《';
 $labels['flagged'] = 'iezﾄｫmﾄ鍍ﾄ《';
 $labels['unanswered'] = 'neatbildﾄ鍍ﾄ《';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'dzﾄ都tﾄ《';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'invertﾄ鍍';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'atvﾄ途t jaunﾄ� logﾄ�';
 $labels['emlsave'] = 'lejupielﾄ‥ﾄ鍍 (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'rediﾄ｣ﾄ鍍 kﾄ� jaunu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Rakstﾄｫt HTML vﾄ都tules';
 $labels['htmlonreply'] = 'tikai atbildot uz HTML formatﾄ鍍ﾄ［ vﾄ都tulﾄ杜';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML paraksts';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Rﾄ‥ﾄｫt priekﾅ｡skatﾄｫjuma paneli';
 $labels['skin'] = 'Interfeisa izskats';
 $labels['logoutclear'] = 'Izejot no sistﾄ杜as, iztﾄｫrﾄｫt miskasti';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Atbildot izﾅ�emt oriﾄ｣inﾄ〕o parakstu no vﾄ都
 $labels['autoaddsignature'] = 'Automﾄ》iski pievienot parakstu';
 $labels['newmessageonly'] = 'tikai jaunas vﾄ都tules';
 $labels['replyandforwardonly'] = 'tikai atbildes un pﾄ〉sﾅｫtﾄｫjumi';
-$labels['replysignaturepos'] = 'Atbildot vai pﾄ〉sﾅｫtot ievietot parakstu';
-$labels['belowquote'] = 'zem citﾄ》a';
-$labels['abovequote'] = 'virs citﾄ》a';
 $labels['insertsignature'] = 'Ievietot parakstu';
 $labels['previewpanemarkread']  = 'Atzﾄｫmﾄ鍍 priekﾅ｡skatﾄｫtﾄ《 vﾄ都tules kﾄ� lasﾄｫtas';
 $labels['afternseconds']  = 'pﾄ田 $n sekundﾄ杜';
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index d65976fa2..b69a73e2b 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -17,87 +17,89 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'An error occurred!';
-$messages['loginfailed']  = 'Neizdevﾄ《 pieslﾄ堵ties';
+$messages['errortitle']  = 'Radﾄ《 kﾄｼﾅｫda!';
+$messages['loginfailed']  = 'Pieslﾄ堵ties neizdevﾄ《';
 $messages['cookiesdisabled'] = 'Jﾅｫsu pﾄ〉lﾅｫkprogramma neatbalsta sﾄｫkdatnes (cookies)';
-$messages['sessionerror'] = 'Jﾅｫsu sessija ir beigusies';
+$messages['sessionerror'] = 'Jﾅｫsu sessija ir beigusies.';
 $messages['storageerror'] = 'Neizdevﾄ《 pieslﾄ堵ties IMAP serverim';
-$messages['servererror'] = 'Servera kﾄｼﾅｫme.';
+$messages['servererror'] = 'Servera kﾄｼﾅｫda!';
 $messages['servererrormsg'] = 'Servera kﾄｼﾅｫda: $msg';
 $messages['dberror'] = 'Datubﾄ】es kﾄｼﾅｫda!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Neizdevﾄ《 veikt darbﾄｫbu: Mape ir tikai lasﾄ［a (read only).';
-$messages['errornoperm'] = 'Neizdevﾄ《 veikt darbﾄｫbu: Piekﾄｼuve liegta.';
-$messages['invalidrequest'] = 'Nederﾄｫgs pieprasﾄｫjums. Dati netika saglabﾄ》i.';
-$messages['invalidhost'] = 'Invalid server name.';
+$messages['requesttimedout'] = 'Pieprasﾄｫjumam iestﾄ）ﾄ《 noilgums';
+$messages['errorreadonly'] = 'Neizdevﾄ《 veikt darbﾄｫbu: mape ir tikai lasﾄ［a (read only)';
+$messages['errornoperm'] = 'Neizdevﾄ《 veikt darbﾄｫbu: piekﾄｼuve liegta';
+$messages['erroroverquota'] = 'Operﾄ…iju nav iespﾄ屠ams veikt. Uz diska nav brﾄｫvas veitas.';
+$messages['erroroverquotadelete'] = 'Uz diska nav brﾄｫvas vietas. Lai dzﾄ都tu vﾄ都tuli, lietojiet SHIFT+DEL.';
+$messages['invalidrequest'] = 'Nederﾄｫgs pieprasﾄｫjums! Dati netika saglabﾄ》i ...';
+$messages['invalidhost'] = 'Nederﾄｫgs servera nosaukums';
 $messages['nomessagesfound'] = 'ﾅ�ajﾄ� pastkastﾄ� nav vﾄ都tuﾄｼu';
-$messages['loggedout'] = 'Jﾅｫs esat veiksmﾄｫgi atslﾄ電zies no sistﾄ杜as';
-$messages['mailboxempty'] = 'Pastkaste tukﾅ｡a';
-$messages['refreshing'] = 'Refreshing...';
+$messages['loggedout'] = 'Jﾅｫs esat veiksmﾄｫgi atslﾄ電zies no sistﾄ杜as. Uz redzﾄ毒｡anos!';
+$messages['mailboxempty'] = 'Pastkaste ir tukﾅ｡a';
+$messages['refreshing'] = 'Atjauno...';
 $messages['loading'] = 'Notiek ielﾄ‥e...';
-$messages['uploading'] = 'Notiek faila augﾅ｡upielﾄ‥e...';
+$messages['uploading'] = 'Augﾅ｡upielﾄ‥e failu...';
 $messages['uploadingmany'] = 'Augﾅ｡upielﾄ‥ﾄ� failus...';
-$messages['loadingdata'] = 'Tiek ielﾄ‥ﾄ鍍i dati...';
-$messages['checkingmail'] = 'Notiek pasta pﾄ〉baude...';
-$messages['sendingmessage'] = 'Tiek sﾅｫtﾄｫta vﾄ都tule...';
+$messages['loadingdata'] = 'Ielﾄ‥ﾄ� datus...';
+$messages['checkingmail'] = 'Notiek pasta pﾄ〉baude ...';
+$messages['sendingmessage'] = 'Tiek sﾅｫtﾄｫta vﾄ都tule ...';
 $messages['messagesent'] = 'Vﾄ都tule nosﾅｫtﾄｫta veiksmﾄｫgi';
-$messages['savingmessage'] = 'Vﾄ都tule tiek saglabﾄ》a...';
-$messages['messagesaved'] = 'Vﾄ都tule saglabﾄ》a pie uzmetumiem';
-$messages['successfullysaved'] = 'Iestatﾄｫjumi veiksmﾄｫgi saglabﾄ》i';
-$messages['addedsuccessfully'] = 'Ieraksts veiksmﾄｫgi pievienots adreﾅ｡u grﾄ［atai';
-$messages['contactexists'] = 'Ieraksts ar ﾅ｡ﾄ‥u e-pasta adresi jau eksistﾄ�';
+$messages['savingmessage'] = 'Vﾄ都tule tiek saglabﾄ》a ...';
+$messages['messagesaved'] = 'Vﾄ都tule saglabﾄ》a Uzmetumos';
+$messages['successfullysaved'] = 'Vﾄ都tule veiksmﾄｫgi saglabﾄ》a';
+$messages['addedsuccessfully'] = 'Kontakts veiksmﾄｫgi pievienots adreﾅ｡u grﾄ［atai';
+$messages['contactexists'] = 'Kontakts ar ﾅ｡ﾄ‥u e-pasta adresi jau eksistﾄ�';
 $messages['contactnameexists'] = 'Kontakts ar ﾅ｡ﾄ‥u vﾄ〉du jau eksistﾄ�.';
-$messages['blockedimages'] = 'Droﾅ｡ﾄｫbas nolﾅｫkos attﾄ斗i, kas tiek ielﾄ‥ﾄ鍍i no cita servera, ﾅ｡ajﾄ� vﾄ都tulﾄ� ir bloﾄｷﾄ鍍i';
-$messages['encryptedmessage'] = 'ﾅ�ﾄｫ ir ﾅ｡ifrﾄ鍍a vﾄ都tule un diemﾅｾﾄ斗 nevar tikt parﾄ‥ﾄｫta';
-$messages['nocontactsfound'] = 'Ieraksti netika atrasti';
-$messages['contactnotfound'] = 'Prasﾄｫtais kontakts nav atrasts';
-$messages['contactsearchonly'] = 'Ievadiet meklﾄ毒｡anas kritﾄ途ijus, lai atrastu kontaktus';
+$messages['blockedimages'] = 'Droﾅ｡ﾄｫbas nolﾅｫkos attﾄ斗i, kuri tiek ielﾄ‥ﾄ鍍i no cita servera, ﾅ｡ajﾄ� vﾄ都tulﾄ� ir bloﾄｷﾄ鍍i';
+$messages['encryptedmessage'] = 'Atvainojiet - ﾅ｡ﾄｫ ir ﾅ｡ifrﾄ鍍a vﾄ都tule un diemﾅｾﾄ斗 nevar tikt parﾄ‥ﾄｫta ...';
+$messages['nocontactsfound'] = 'Kontakti netika atrasti';
+$messages['contactnotfound'] = 'Pieprasﾄｫtais kontakts nav atrasts';
+$messages['contactsearchonly'] = 'Lai atrastu kontaktus, ievadiet meklﾄ毒｡anas kritﾄ途ijus';
 $messages['sendingfailed'] = 'Vﾄ都tule netika nosﾅｫtﾄｫta';
 $messages['senttooquickly'] = 'Lﾅｫdzu uzgaidiet $sec sekundi(-es) pirms sﾅｫtiet ﾅ｡o vﾄ都tuli';
-$messages['errorsavingsent'] = 'Notika kﾄｼﾅｫda saglabﾄ）ot nosﾅｫtﾄｫto vﾄ都tuli';
-$messages['errorsaving'] = 'Saglabﾄ）ot vﾄ都tuli notikusi kﾄｼﾅｫme, vﾄ都tule netika saglabﾄ》a';
-$messages['errormoving'] = 'Vﾄ都tule netika pﾄ〉vietota';
-$messages['errorcopying'] = 'Neizdevﾄ《 pﾄ〉kopﾄ鍍 vﾄ都tules.';
-$messages['errordeleting'] = 'Vﾄ都tule netika dzﾄ都ta';
-$messages['errormarking'] = 'Nebija iespﾄ屠ams iezﾄｫmﾄ鍍 vﾄ都tuli';
-$messages['deletecontactconfirm']  = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t iezﾄｫmﾄ鍍o(ﾄ《) kontaktpersonas?';
+$messages['errorsavingsent'] = 'Saglabﾄ）ot vﾄ都tuli notika kﾄｼﾅｫda - vﾄ都tule netika saglabﾄ》a';
+$messages['errorsaving'] = 'Saglabﾄ）ot notika kﾄｼﾅｫda';
+$messages['errormoving'] = 'Vﾄ都tule(s) netika pﾄ〉vietota(s)';
+$messages['errorcopying'] = 'Vﾄ都tules pﾄ〉kopﾄ鍍 neizdevﾄ《';
+$messages['errordeleting'] = 'Vﾄ都tules izdzﾄ都t neizdevﾄ《';
+$messages['errormarking'] = 'Iezﾄｫmﾄ鍍 vﾄ都tules nebija iespﾄ屠ams';
+$messages['deletecontactconfirm']  = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t iezﾄｫmﾄ鍍ﾄ《 kontaktpersonas?';
 $messages['deletegroupconfirm']  = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t atzﾄｫmﾄ鍍o grupu?';
-$messages['deletemessagesconfirm'] = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t iezﾄｫmﾄ鍍o(ﾄ《) vﾄ都tules?';
+$messages['deletemessagesconfirm'] = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t iezﾄｫmﾄ鍍ﾄ《 vﾄ都tules?';
 $messages['deletefolderconfirm']  = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t ﾅ｡o mapi?';
-$messages['purgefolderconfirm']  = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t visas vﾄ都tules, kas atrodas ﾅ｡ajﾄ� mapﾄ�?';
-$messages['contactdeleting'] = 'Kontakts(-i) tiek dzﾄ都ti...';
+$messages['purgefolderconfirm']  = 'Vai tieﾅ｡ﾄ［ vﾄ斗aties dzﾄ都t visas vﾄ都tules, kuras atrodas ﾅ｡ajﾄ� mapﾄ�?';
+$messages['contactdeleting'] = 'Dzﾄ毒｡ kontaktus...';
 $messages['groupdeleting'] = 'Dzﾄ毒｡ grupu...';
 $messages['folderdeleting'] = 'Dzﾄ毒｡ mapi...';
-$messages['foldermoving'] = 'Pﾄ〉vietoju mapi...';
+$messages['foldermoving'] = 'Pﾄ〉vieto mapi...';
 $messages['foldersubscribing'] = 'Pieslﾄ電z mapi...';
 $messages['folderunsubscribing'] = 'Atslﾄ電z mapi...';
-$messages['formincomplete'] = 'Formulﾄ〉s nav pilnﾄｫbﾄ� aizpildﾄｫts';
-$messages['noemailwarning'] = 'Lﾅｫdzu ievadiet pareizu e-pasta adresi';
+$messages['formincomplete'] = 'Forma nav pilnﾄｫbﾄ� aizpildﾄｫta';
+$messages['noemailwarning'] = 'Lﾅｫdzu ievadiet korektu e-pasta adresi';
 $messages['nonamewarning']  = 'Lﾅｫdzu ievadiet vﾄ〉du';
 $messages['nopagesizewarning'] = 'Lﾅｫdzu ievadiet lapas izmﾄ途u';
-$messages['nosenderwarning'] = 'Lﾅｫdzu ievadiet saﾅ�ﾄ杜ﾄ屠a e-pasta adresi';
+$messages['nosenderwarning'] = 'Lﾅｫdzu ievadiet sﾅｫtﾄｫtﾄ）a e-pasta adresi';
 $messages['norecipientwarning'] = 'Lﾅｫdzu ievadiet vismaz vienu saﾅ�ﾄ杜ﾄ屠u';
 $messages['nosubjectwarning']  = 'Lauks "temats" ir tukﾅ｡s. Vai vﾄ斗aties to aizpildﾄｫt tagad?';
-$messages['nobodywarning'] = 'Sﾅｫtﾄｫt vﾄ都tuli bez satura teksta?';
-$messages['notsentwarning'] = 'Vﾄ都tule netika nosﾅｫtﾄｫta. Vai tieﾅ｡ﾄ［ vﾄ斗aties atcelt vﾄ都tules rakstﾄｫsanu?';
-$messages['noldapserver'] = 'Lﾅｫdzu izvﾄ斗aties LDAP serveri';
+$messages['nobodywarning'] = 'Sﾅｫtﾄｫt vﾄ都tuli bez teksta?';
+$messages['notsentwarning'] = 'Vﾄ都tule netika nosﾅｫtﾄｫta. Vai tieﾅ｡ﾄ［ vﾄ斗aties atcelt vﾄ都tules rakstﾄｫﾅ｡anu?';
+$messages['noldapserver'] = 'Lai meklﾄ鍍u, lﾅｫdzu izvﾄ斗aties LDAP serveri';
 $messages['nosearchname'] = 'Lﾅｫdzu ievadiet kontaktpersonas vﾄ〉du vai e-pasta adresi';
-$messages['notuploadedwarning'] = 'Visi pielikumi vﾄ斗 nav augﾅ｡upielﾄ‥ﾄ鍍i. Lﾅｫdzu uzgaidiet vai atceﾄｼiet augﾅ｡upielﾄ‥i!';
+$messages['notuploadedwarning'] = 'Visi pielikumi vﾄ斗 nav augﾅ｡upielﾄ‥ﾄ鍍i - lﾅｫdzu uzgaidiet vai atceﾄｼiet augﾅ｡upielﾄ‥i';
 $messages['searchsuccessful'] = 'Atrastas $nr vﾄ都tules';
-$messages['contactsearchsuccessful'] = 'Atrasti $nr kontakti.';
-$messages['searchnomatch'] = 'Meklﾄ毒｡anﾄ� nekas netika atrasts';
-$messages['searching'] = 'Notiek meklﾄ毒｡ana...';
-$messages['checking'] = 'Notiek pﾄ〉baude...';
-$messages['nospellerrors'] = 'Netika atrastas pareizrakstﾄｫbas kﾄｼudas';
+$messages['contactsearchsuccessful'] = 'Atrasti $nr kontakti';
+$messages['searchnomatch'] = 'Meklﾄ屠ot nekas netika atrasts';
+$messages['searching'] = 'Meklﾄ�...';
+$messages['checking'] = 'Pﾄ〉bauda...';
+$messages['nospellerrors'] = 'Pareizrakstﾄｫbas kﾄｼﾅｫdas netika atrastas';
 $messages['folderdeleted'] = 'Mape veiksmﾄｫgi izdzﾄ都ta';
 $messages['foldersubscribed'] = 'Mape veiksmﾄｫgi pieslﾄ堵ta.';
 $messages['folderunsubscribed'] = 'Mape veiksmﾄｫgi atslﾄ堵ta.';
 $messages['folderpurged'] = 'Mape tika veiksmﾄｫgi iztukﾅ｡ota.';
-$messages['folderexpunged'] = 'Mape tika veiksmﾄｫgi saspiesta.';
+$messages['folderexpunged'] = 'Mape saspiesta veiksmﾄｫgi';
 $messages['deletedsuccessfully'] = 'Veiksmﾄｫgi izdzﾄ都ts';
-$messages['converting'] = 'Tiek novﾄ〔ts vﾄ都tules formatﾄ屠ums...';
+$messages['converting'] = 'Tiek noﾅ�emts vﾄ都tules formatﾄ屠ums...';
 $messages['messageopenerror'] = 'Nevarﾄ屠a ielﾄ‥ﾄ鍍 vﾄ都tuli no servera';
-$messages['fileuploaderror'] = 'Neizdevﾄ《 ielﾄ‥ﾄ鍍 failu';
+$messages['fileuploaderror'] = 'Faila augﾅ｡upielﾄ‥e neveiksmﾄｫga';
 $messages['filesizeerror'] = 'Ielﾄ‥ﾄ鍍ais fails pﾄ〉sniedz pieﾄｼaujamo $size apjomu';
 $messages['copysuccess'] = 'Veiksmﾄｫgi nokopﾄ鍍as $nr vﾄ都tules';
 $messages['copyerror'] = 'Nevarﾄ屠a nokopﾄ鍍 nevienu adresi';
@@ -119,9 +121,9 @@ $messages['selectimportfile'] = 'Lﾅｫdzu izvﾄ斗ieties failu, ko vﾄ斗aties augﾅ｡up
 $messages['addresswriterror'] = 'Izvﾄ斗ﾄ鍍ﾄ《 adreﾅ｡u grﾄ［atas datus nevar labot';
 $messages['contactaddedtogroup'] = 'Kontakti tika veiksmﾄｫgi pievienoti ﾅ｡ai grupai.';
 $messages['contactremovedfromgroup'] = 'Kontakti tika veiksmﾄｫgi atvienoti no ﾅ｡ﾄｫs grupas.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'Grupﾄ� nekas netika mainﾄｫts.';
 $messages['importwait'] = 'Importﾄ屠u, lﾅｫdzu uzgaidiet...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = 'Imports neizdevﾄ《! Augﾅ｡upielﾄ‥ﾄ鍍ais fails nav derﾄｫgs importam.';
 $messages['importconfirm'] = '<b>Veiksmﾄｫgi ieimportﾄ鍍i $inserted kontakti, netika importﾄ鍍i $skipped esoﾅ｡i ieraksti</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Izlaida $skipped jau eksistﾄ屠oﾅ｡us ierakstus</b>';
 $messages['opnotpermitted'] = 'Darbﾄｫba nav atﾄｼauta!';
@@ -163,7 +165,7 @@ $messages['invalidimageformat'] = 'Nederﾄｫgs attﾄ斗a formﾄ》s.';
 $messages['mispellingsfound'] = 'Vﾄ都tulﾄ� atrastas pareizrakstﾄｫbas kﾄｼﾅｫdas.';
 $messages['parentnotwritable'] = 'Neizdevﾄ《 izveidot/pﾄ〉vietot mapi uz atzﾄｫmﾄ鍍o virsmapi. Nav piekﾄｼuves tiesﾄｫbu.';
 $messages['messagetoobig'] = 'Vﾄ都tule ir pﾄ〉ﾄ〔 liela, lai to varﾄ鍍u apstrﾄ‥ﾄ》.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['attachmentvalidationerror'] = 'BRﾄｪDINﾄ�JUMS! ﾅ�is pielikums ir aizdomﾄｫgs, jo tﾄ� tips neatbilst tipam, kurﾅ｡ ir uzrﾄ‥ﾄｫts e-pasta ziﾅ�ojumﾄ�. Ja jﾅｫs neuzticaties sﾅｫtﾄｫtﾄ）am, ﾅ｡o failu Jums vaﾄｼﾄ� vﾄ途t nevajadzﾄ鍍u, jo tas var saturﾄ鍍 ﾄｼaunprﾄ》ﾄｫgu saturu. <br/><br/><em>Bﾅｫtu jﾄ｜ﾅｫt: $expected; Bet ir: $detected</em>';
+$messages['noscriptwarning'] = 'Uzmanﾄｫbu: lai lasﾄｫtu e-pastus, Jﾅｫsu tﾄｫmekﾄｼa pﾄ〉lﾅｫkﾄ� jﾄ｜ﾅｫt iespﾄ屠otiem JavaScript.';
 
 ?>
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 247cc334d..bb9606e6a 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾐ墟ｾﾐｿﾐｸﾑ�ﾐｰﾑ�';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ﾐ湲�ﾐｵﾐｼﾐｵﾑ�ﾑひｸ ﾐｲﾐｾ...';
 $labels['download'] = 'ﾐ湲�ﾐｵﾐｷﾐｵﾐｼﾐｸ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'ﾐ斷ｵﾐｿﾑ�ﾐｾﾑ�ﾐｸﾑひｰﾐｽﾐｸ';
 $labels['flagged'] = 'ﾐ榧ｱﾐｵﾐｻﾐｵﾐｶﾐｰﾐｽﾐｾ';
 $labels['unanswered'] = 'ﾐ斷ｵﾐｾﾐｴﾐｳﾐｾﾐｲﾐｾﾑ�ﾐｵﾐｽﾐｾ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾐ侑ｷﾐｱﾑ�ﾐｸﾑ威ｰﾐｽﾐｾ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'ﾐ榧ｱﾑ�ﾐｰﾑひｽﾐｾ';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'ﾐ樮ひｲﾐｾﾑ�ﾐｸ ﾐｲﾐｾ ﾐｽﾐｾﾐｲ ﾐｿﾑ�ﾐｾﾐｷﾐｾﾑ�ﾐｵﾑ�';
 $labels['emlsave'] = 'ﾐ湲�ﾐｵﾐｷﾐｵﾐｼﾐｸ (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'ﾐ｣ﾑ�ﾐｵﾐｴﾐｸ ﾐｺﾐｰﾐｺﾐｾ ﾐｽﾐｾﾐｲﾐｾ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾐ渙ｸﾑ威ｸ HTML ﾐｿﾐｾﾑ�ﾐｰﾐｺﾐｰ';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ﾐｿﾐｾﾑひｿﾐｸﾑ�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾐ湲�ﾐｸﾐｺﾐｰﾐｶﾐｸ ﾐｿﾑ�ﾐｾﾐｷﾐｾﾑ�ﾐｵﾑ� ﾐｷﾐｰ ﾐｿﾑ�ﾐｵﾐｳﾐｻﾐｵﾐｴ';
 $labels['skin'] = 'ﾐ慴ｾﾐｴﾐｵﾐｻ ﾐｽﾐｰ ﾐｸﾐｷﾐｳﾐｻﾐｵﾐｴﾐｾﾑ�';
 $labels['logoutclear'] = 'ﾐ佯�ﾑ�ﾐｸﾑ�ﾑひｸ ﾑ侑ｰ ﾐ墟ｰﾐｽﾑひｰﾑひｰ ﾐｿﾑ�ﾐｸ ﾐｸﾐｷﾐｻﾐｵﾐｷ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾐ湲�ﾐｸ ﾐｾﾐｴﾐｳﾐｾﾐｲﾐｰﾑ�ﾐｰﾑ墟ｵ ﾐｾﾑび�ﾑび�ﾐｰﾐｽﾐｸ
 $labels['autoaddsignature'] = 'ﾐ籍ｲﾑひｾﾐｼﾐｰﾑび�ﾐｺﾐｸ ﾐｴﾐｾﾐｴﾐｰﾐｲﾐｰﾑ� ﾐｿﾐｾﾑひｿﾐｸﾑ�';
 $labels['newmessageonly'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｽﾐｾﾐｲﾐｸ ﾐｿﾐｸﾑ�ﾐｼﾐｰ';
 $labels['replyandforwardonly'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｾﾐｴﾐｳﾐｾﾑ�ﾐｾﾐｲﾐｸ ﾐｸ ﾐｿﾑ�ﾐｵﾐｿﾑ�ﾐｰﾑ慴ｰﾑ墟ｰ';
-$labels['replysignaturepos'] = 'ﾐ湲�ﾐｸ ﾐｾﾐｴﾐｳﾐｾﾐｲﾐｰﾑ�ﾐｰﾑ墟ｵ ﾐｸﾐｻﾐｸ ﾐｿﾑ�ﾐｵﾐｿﾑ�ﾐｰﾑ慴ｰﾑ墟ｵ ﾑ�ﾑひｰﾐｲﾐｸ ﾐｿﾐｾﾑひｿﾐｸﾑ�';
-$labels['belowquote'] = 'ﾐｿﾐｾﾐｴ ﾑ�ﾐｸﾑひｸﾑ�ﾐｰﾐｽﾐｾﾑひｾ';
-$labels['abovequote'] = 'ﾐｽﾐｰﾐｴ ﾑ�ﾐｸﾑひｸﾑ�ﾐｰﾐｽﾐｾﾑひｾ';
 $labels['insertsignature'] = 'ﾐ漬ｼﾐｵﾑひｽﾐｸ ﾐｿﾐｾﾑひｿﾐｸﾑ�';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index c14370b14..f7a8d9a12 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'ﾐ斷ｵﾐｲﾐｰﾐｶﾐｵﾑ�ﾐｺﾐｾ ﾐｱﾐｰﾑ�ﾐｰﾑ墟ｵ! ﾐ渙ｾﾐｴﾐｰﾑひｾﾑ�ﾐｸﾑひｵ ﾐｽﾐｵ ﾑ�ﾐｵ ﾐｷﾐｰﾑ�ﾑσｲﾐｰﾐｽﾐｸ.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ﾐ斷ｵﾐｼﾐｰﾑひｵ ﾐｿﾐｸﾑ�ﾐｼﾐｰ ﾐｲﾐｾ ﾐｾﾐｲﾐｰ ﾑ�ﾐｰﾐｽﾐｴﾐｰﾑ�ﾐｵ';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 5644f1599..ed0e7402a 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '犇ｪ犇歩ｴｰ犒坂�財ｴ､犒財ｴ､犒≒ｴ�';
 $labels['move']     = '犇ｨ犒�犇歩ｵ財ｴ歩ｵ≒ｴ�';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = '犇｡犒伶ｴ｣犒坂�財ｴｲ犒金ｴ｡犒�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '犇ｨ犇ｿ犇ｲ犇ｵ犇ｿ犇ｲ犒≒ｴｳ犇ｳ 犇ｪ犒�犇憫ｵ�';
 $labels['unread'] = '犇ｵ犇ｾ犇ｯ犇ｿ犇歩ｵ財ｴ歩ｴｾ犇､犒財ｴ､犇､犒�';
 $labels['flagged'] = '犇�犇游ｴｯ犇ｾ犇ｳ犇ｪ犒財ｴｪ犒�犇游ｵ≒ｴ､犒財ｴ､犇ｿ犇ｯ犇ｵ';
 $labels['unanswered'] = '犇ｮ犇ｱ犒≒ｴｪ犇游ｴｿ 犇歩ｵ癌ｴ游ｵ≒ｴ歩ｵ財ｴ歩ｴｾ犇､犒財ｴ､';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '犇ｮ犇ｾ犇ｯ犒財ｴ壟ｵ財ｴ壟ｴｵ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = '犇､犇ｲ犇､犇ｿ犇ｰ犇ｿ犇歩ｵ財ｴ歩ｵ≒ｴ�';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = '犇ｪ犒≒ｴ､犇ｿ犇ｯ 犇ｵ犇ｿ犇ｨ犒坂�財ｴ｡犒金ｴｯ犇ｿ犇ｲ犒坂�� 犇､犒≒ｴｱ犇歩ｵ財ｴ歩ｵ≒ｴ�';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '犇ｪ犒≒ｴ､犇ｿ犇ｯ犇､犇ｾ犇ｯ犇ｿ 犇､犇ｿ犇ｰ犒≒ｴ､犒財ｴ､犒≒ｴ�';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML 犇ｸ犇ｨ犒財ｴｦ犒�犇ｶ犇吭ｵ財ｴ吭ｴｳ犒坂�� 犇ｰ犇壟ｴｿ犇歩
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = '犇ｪ犒≒ｴ､犇ｿ犇ｯ 犇ｸ犇ｨ犒財ｴｦ犒�犇ｶ犇� 犇ｮ犇ｾ犇､犒財ｴｰ犇�';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = '犇霞ｴｦ犒財ｴｧ犇ｾ犇ｰ犇｣犇､犒財ｴ､犇ｿ犇ｨ犒� 犇､犇ｾ犇ｴ犒�';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n 犇ｨ犇ｿ犇ｮ犇ｿ犇ｷ犇吭ｵ財ｴ吭ｴｳ犒坂�� 犇歩ｴｴ犇ｿ犇樅ｵ財ｴ樅ｵ≒ｵ�';
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index 85dc43d77..28eb22be2 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = '犇ｪ犒財ｴｰ犇ｵ犇ｰ犒坂�財ｴ､犒財ｴ､犇ｨ犇� 犇､犇游ｴｸ犇ｪ犒財ｴｪ犒�犇游ｵ財ｴ游ｵ� . 犇�犇ｨ犒≒ｴｮ犇､犇ｿ 犇ｨ犇ｿ犇ｷ犒�犇ｧ犇ｿ犇歩ｵ財ｴ歩ｴｪ犒�犇游ｵ財ｴ游ｴｿ犇ｰ犇ｿ犇歩ｵ財ｴ歩ｵ≒ｴｨ犒財ｴｨ犒�';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = '犇�犇ｸ犇ｾ犇ｧ犒≒ｴｵ犇ｾ犇ｯ 犇�犇ｪ犒�犇歩ｵ財ｴｷ ! 犇亭ｴｰ犒� 犇ｰ犒�犇籾ｴｯ犒≒ｴ� 犇ｸ犒もｴ歩ｵ財ｴｷ犇ｿ犇壟ｵ財ｴ壟ｴｿ犇游ｵ財ｴ游ｴｿ犇ｲ犒財ｴｲ';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 1a02a7e2d..02b129e0b 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '爨ｨ爨歩･坂�財､歩､ｲ';
 $labels['move']     = '爨ｹ爨ｲ爨ｵ爨ｾ';
 $labels['moveto']   = '爨ｯ爨ｾ 爨ｫ爭金､ｲ爭財､｡爨ｰ爨ｮ爨ｧ爭� 爨�爭�爨ｵ爨ｾ';
 $labels['download'] = '爨霞､､爨ｰ爨ｵ爭も､ｨ 爨倨･財､ｯ爨ｾ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '爨ｸ爨ｧ爭坂�財､ｯ爨ｾ爨壟･� 爨ｪ爨ｾ爨ｨ';
 $labels['unread'] = '爨ｨ 爨ｵ爨ｾ爨壟､ｲ爭�爨ｲ爭�';
 $labels['flagged'] = '爨籾･も､｣ 爨ｲ爨ｾ爨ｵ爨ｲ爭�爨ｲ爭�';
 $labels['unanswered'] = '爨霞､､爭財､､爨ｰ 爨ｨ 爨ｦ爨ｿ爨ｲ爭�爨ｲ爭�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '爨歩､ｾ爨｢爭も､ｨ 爨游､ｾ爨歩､ｲ爭�爨ｲ爨ｾ(爨ｲ爭�)';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = '爨霞､ｲ爨� 爨歩､ｰ爨ｾ';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = '爨ｨ爨ｵ爭�爨ｨ 爨籾､ｿ爨｡爨歩･� 爨霞､倨､｡爨ｾ';
 $labels['emlsave'] = '爨�爨鐘､ｮ爨鐘､ｲ 爨ｸ爭坂�財､ｵ爨ｰ爭も､ｪ爨ｾ爨､ 爨霞､､爨ｰ爨ｵ爭も､ｨ 爨倨･財､ｯ爨ｾ';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '爨ｨ爨ｵ爭�爨ｨ 爨�爨ｹ爭� 爨�爨ｸ爨ｾ 爨ｸ爨も､ｪ爨ｾ爨ｦ爨ｿ爨､ 爨歩､ｰ爨ｾ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '爨鐘､� 爨游･� 爨鐘､ｮ 爨鐘､ｲ 爨ｸ爨も､ｦ爭�爨ｶ 爨､爨ｯ爨ｾ爨
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '爨鐘､� 爨游･� 爨鐘､ｮ 爨鐘､ｲ 爨ｸ爨ｹ爭�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '爨ｪ爭財､ｰ爨歩･財､ｰ爨ｿ爨ｯ爨ｾ爨ｪ爭も､ｰ爭財､ｵ 爨､爨ｾ爨ｵ爨ｦ爨ｾ爨ｨ 爨ｦ爨ｾ爨籾､ｵ爨ｾ';
 $labels['skin'] = '爨ｦ爭�爨ｷ爭財､ｯ 爨伶･金､ｷ爭財､游･�';
 $labels['logoutclear'] = '爨籾､ｾ爨､爭財､ｯ爨ｾ爨､爭も､ｨ 爨ｬ爨ｾ爨ｹ爭�爨ｰ 爨ｪ爨｡爨､爨ｾ爨も､ｨ爨ｾ 爨歩､壟､ｰ爨ｾ 爨ｪ爭�爨游･� 爨ｸ爨ｾ爨ｫ 爨歩､ｰ爨ｾ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '爨霞､､爭坂�財､､爨ｰ 爨ｦ爭�爨､爨ｾ爨ｨ爨ｾ 爨ｮ爭≒
 $labels['autoaddsignature'] = '爨�爨ｪ爭金､�爨ｪ 爨ｸ爨ｹ爭� 爨歩､ｰ爨ｾ';
 $labels['newmessageonly'] = '爨ｫ爨歩･坂�財､､ 爨ｨ爨ｵ爭�爨ｨ 爨ｸ爨も､ｦ爭�爨ｶ';
 $labels['replyandforwardonly'] = '爨ｫ爨歩･坂�財､､ 爨霞､､爭坂�財､､爨ｰ爭� 爨�窶財､｣爭� 爨ｪ爭≒､｢爭� 爨ｪ爨ｾ爨�爨ｵ爨ｲ爭�爨ｲ爭� 爨ｸ爨も､ｦ爭�爨ｶ';
-$labels['replysignaturepos'] = '爨霞､､爭坂�財､､爨ｰ 爨ｦ爭�爨､爨ｾ爨ｨ爨ｾ 爨歩､ｿ爨も､ｵ爨ｾ 爨ｪ爭≒､｢爭� 爨ｪ爨ｾ爨�爨ｵ爨､爨ｾ爨ｨ爨ｾ 爨ｸ爨ｹ爭� 爨歩､ｰ爨ｾ';
-$labels['belowquote'] = '爨霞､､爨ｾ爨ｰ爨ｯ爨ｾ 爨籾､ｾ爨ｲ爭�';
-$labels['abovequote'] = '爨霞､､爨ｾ爨ｰ爨ｯ爨ｾ爨壟･坂�財､ｯ爨ｾ 爨ｵ爨ｰ';
 $labels['insertsignature'] = '爨ｸ爨ｹ爭� 爨ｮ爨ｧ爭坂�財､ｯ爭� 爨游､ｾ爨歩､ｾ';
 $labels['previewpanemarkread']  = '爨ｪ爭財､ｰ爨ｦ爨ｰ爭財､ｶ爨ｿ爨､ 爨ｸ爨も､ｦ爭�爨ｶ 爨ｪ爨ｾ爨ｹ爭�爨ｲ爭� 爨�爨ｶ爭� 爨籾･≒､｣ 爨歩､ｰ爨ｾ';
 $labels['afternseconds']  = '$n 爨歩･財､ｷ爨｣爨ｾ爨ｨ爨も､､爨ｰ';
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 98edd7efd..bc4097fb5 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '爨ｮ爨ｾ爨ｹ爨ｿ爨､爭�爨ｸ爨ｾ爨�爨ｾ 爨壟･も､� !';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = '爨歩･�爨､爭� 爨歩､ｰ爨｣爭財､ｯ爨ｾ爨ｸ 爨�爨ｸ爨ｮ爨ｰ爭財､･, 爨ｫ爭金､ｲ爭財､｡爨ｰ 爨ｫ爨歩･財､､ 爨ｬ爨倨､｣爭財､ｯ爨ｾ爨ｸ爨ｾ爨�爭�';
 $messages['errornoperm'] = '爨歩･�爨､爭� 爨歩､ｰ爨｣爭財､ｯ爨ｾ爨ｸ 爨�爨ｸ爨ｮ爨ｰ爭財､･, 爨ｪ爨ｰ爨ｵ爨ｾ爨ｨ爨伶･� 爨�爨ｮ爨ｾ爨ｨ爭財､ｯ';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = '爨�爨ｵ爭謂､ｧ 爨ｵ爨ｿ爨ｨ爨も､､爭�! 爨ｮ爨ｾ爨ｹ爨ｿ爨､爭� 爨ｸ爨ｾ爨�爨ｵ爨ｲ爭�爨ｲ爭� 爨ｨ爨ｾ爨ｹ爭�.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '爨ｯ爨ｾ 爨籾､ｾ爨､爭財､ｯ爨ｾ爨ｮ爨ｧ爭� 爨歩･金､｣爨､爨ｾ爨ｹ爭� 爨ｸ爨も､ｦ爭�爨ｶ 爨�爨ｲ爭�爨ｲ爨ｾ 爨ｨ爨ｾ爨ｹ爭�';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index ada834483..318af05ad 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Salin';
 $labels['move']     = 'Alih';
 $labels['moveto']   = 'Alih ke...';
 $labels['download'] = 'Muat Turun';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Muka terkini';
 $labels['unread'] = 'Belum dibaca';
 $labels['flagged'] = 'Ditanda';
 $labels['unanswered'] = 'Belum dijawab';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Telah dipadam';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Songsangkan';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Ubah seperti baharu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Karang mesej HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Tandatangan HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Pamer ruang previu';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Kosongkan Tong sampah ketika keluar';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 0cddd6749..72d2e3075 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Tiada mesej dijumpai dalam kotak mel ini';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 4c7a307d0..cba58dc9c 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopier';
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til...';
 $labels['download'] = 'last ned';
+$labels['open']     = 'ﾃ�pen';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Gjeldende side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
 $labels['unanswered'] = 'Ubesvarte';
+$labels['withattachment'] = 'Med vedlegg';
 $labels['deleted'] = 'Slettet';
 $labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Meldingstekst';
 
 $labels['openinextwin'] = 'ﾃ�pne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
+$labels['changeformattext'] = 'Vis i ren tekst';
+$labels['changeformathtml'] = 'Vis i HTML';
 
 // message compose
 $labels['editasnew']      = 'Rediger som ny';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Bruk HTML-editor';
 $labels['htmlonreply'] = 'ved svar pﾃ･ HTML-melding';
 $labels['htmlonreplyandforward'] = 'ved videresending av eller svar pﾃ･ HTML-melding';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Vis e-postadresse sammen med visningsnavn';
 $labels['previewpane'] = 'Forhﾃ･ndsvisning';
 $labels['skin'] = 'Utseende';
 $labels['logoutclear'] = 'Tﾃｸm sﾃｸppel ved utlogging';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Fjern orginalsignaturen i svar pﾃ･ melding';
 $labels['autoaddsignature'] = 'Legg til signatur';
 $labels['newmessageonly'] = 'kun pﾃ･ nye meldinger';
 $labels['replyandforwardonly'] = 'kun i svar og videresendinger';
-$labels['replysignaturepos'] = 'Plassering av signatur ved svar eller videresending';
-$labels['belowquote'] = 'over sitert melding';
-$labels['abovequote'] = 'under sitert melding';
 $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread']  = 'Merk forhﾃ･ndsviste meldinger som lest';
 $labels['afternseconds']  = 'etter $n sekunder';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 939d1da76..7785f474a 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databasefeil!';
 $messages['requesttimedout'] = 'Forespﾃｸrselen har fﾃ･tt et tidsavbrudd';
 $messages['errorreadonly'] = 'Kunne ikke utfﾃｸre handlingen. Mappen kan kun leses.';
 $messages['errornoperm'] = 'Kan ikke utfﾃｸre operasjon. Nektet tilgang.';
+$messages['erroroverquota'] = 'Kunne ikke utfﾃｸre handlingen, tomt for diskplass.';
+$messages['erroroverquotadelete'] = 'Ingen ledig plass pﾃ･ disk. Bruk SHIFT+DEL for ﾃ･ slette en melding.';
 $messages['invalidrequest'] = 'Ugyldig forespﾃｸrsel! Ingen data ble lagret.';
 $messages['invalidhost'] = 'Ugyldig servernavn.';
 $messages['nomessagesfound'] = 'Det ble ikke funnet noen meldinger i denne mappen';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 4b62e942b..29d43ef9c 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '爨ｪ爭財､ｰ爨､爨ｿ爨ｲ爨ｿ爨ｪ爨ｿ 爨伶､ｰ爭財､ｨ爭≒､ｹ爭金､ｸ爭�';
 $labels['move']     = '爨ｸ爨ｾ爨ｰ爭財､ｨ爭≒､ｹ爭金､ｸ';
 $labels['moveto']   = '爨ｯ爨ｹ爨ｾ爨� 爨ｸ爨ｾ爨ｰ爭財､ｨ爭≒､ｹ爭金､ｸ';
 $labels['download'] = '爨｡爨ｾ爨癌､ｨ爨ｲ爭金､｡';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = '爨ｨ爨ｪ爨｢爨ｿ爨鐘､歩､ｾ |';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '爨説､�-爨游･�-爨説､ｮ-爨鐘､ｲ (HTML) 爨ｮ爭�爨ｲ 爨ｲ爨籾､ｨ
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '爨説､�-爨游･�-爨説､ｮ-爨鐘､ｲ (HTML) 爨ｹ爨ｸ爭財､､爨ｾ爨歩･財､ｷ爨ｰ';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '爨ｪ爭も､ｰ爭財､ｵ 爨ｦ爭�爨ｷ爭財､ｯ 爨ｦ爭�爨籾､ｾ爨霞､ｨ爭≒､ｹ爭金､ｸ';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index 0c764ba8a..c5214bb0f 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '爨ｯ爭� 爨ｮ爭�爨ｲ爨ｬ爨歩･財､ｸ 爨ｮ爨ｾ 爨歩･≒､ｨ爭� 爨ｮ爭�爨ｲ 爨巵･謂､ｨ';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index fd74ce4f1..eb44eefc0 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieer';
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Downloaden';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Weergeven';
 $labels['showanyway'] = 'Toch weergeven';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML berichten opmaken';
 $labels['htmlonreply'] = 'enkel bij beantwoorden van een HTML bericht';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML handtekening';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Opmaakprofiel';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Verwijder handtekening uit het origneel bij b
 $labels['autoaddsignature'] = 'Handtekening automatisch toevoegen';
 $labels['newmessageonly'] = 'alleen bij nieuwe berichten';
 $labels['replyandforwardonly'] = 'alleen bij beantwoorden en doorsturen';
-$labels['replysignaturepos'] = 'Ondertekening plaatsen bij beantwoorden of doorsturen';
-$labels['belowquote'] = 'onder het citaat';
-$labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Handtekening invoegen';
 $labels['previewpanemarkread']  = 'Markeer voorbeeldbericht als gelezen';
 $labels['afternseconds']  = 'Na $n seconden';
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index 7e61c97c8..d87329dc3 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Fout!';
 $messages['requesttimedout'] = 'Aanvraag verlopen';
 $messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige server.';
 $messages['nomessagesfound'] = 'Er zijn geen berichten in deze map...';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index abe96a90f..7bd48bd4a 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiﾃｫren';
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Openen';
 $labels['showattachment'] = 'Toon';
 $labels['showanyway'] = 'Laat toch zien';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Gemarkeerd';
 $labels['unanswered'] = 'Onbeantwoord';
+$labels['withattachment'] = 'Met bijlage';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Inhoud';
 
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
+$labels['changeformattext'] = 'Weergeven als platte tekst';
+$labels['changeformathtml'] = 'Weergeven als opgemaakte tekst (HTML)';
 
 // message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Berichten opstellen in HTML-opmaak';
 $labels['htmlonreply'] = 'alleen bij beantwoorden van HTML-berichten';
 $labels['htmlonreplyandforward'] = 'bij doorsturen of beantwoorden van een HTML-bericht';
 $labels['htmlsignature'] = 'HTML-ondertekening';
+$labels['showemail'] = 'Toon e-mailadressen met weergavenaam';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Interfacestijl';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Verwijder oorspronkelijke ondertekening van b
 $labels['autoaddsignature'] = 'Ondertekening automatisch toevoegen';
 $labels['newmessageonly'] = 'alleen bij nieuwe berichten';
 $labels['replyandforwardonly'] = 'alleen bij antwoorden en doorsturen';
-$labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorsturen';
-$labels['belowquote'] = 'onder het citaat';
-$labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Ondertekening invoegen';
 $labels['previewpanemarkread']  = 'Markeer voorbeeldberichten als gelezen';
 $labels['afternseconds']  = 'na $n seconden';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 05a362104..4a67e1590 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -25,9 +25,11 @@ $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
 $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
 $messages['dberror'] = 'Databasefout!';
-$messages['requesttimedout'] = 'Wachttijd verzoek overschreden';
+$messages['requesttimedout'] = 'Verzoek duurde te lang';
 $messages['errorreadonly'] = 'De bewerking kan niet uitgevoerd worden. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
+$messages['erroroverquota'] = 'Niet in staat om de bewerking uit te voeren. Onvoldoende vrije opslagruimte.';
+$messages['erroroverquotadelete'] = 'Onvoldoende vrije opslagruimte. Gebruik Shift+Del om een bericht te verwijderen.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige servernaam.';
 $messages['nomessagesfound'] = 'Geen berichten gevonden in deze mailbox.';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index e67f758e5..d1a1c5700 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopier';
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til 窶ｦ';
 $labels['download'] = 'Last ned';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Gjeldande side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
 $labels['unanswered'] = 'Ikkje svara';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Sletta';
 $labels['undeleted'] = 'Ikkje sletta';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Meldingstekst';
 
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Rediger som ny';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Lag HTML-meldingar';
 $labels['htmlonreply'] = 'ved svar pﾃ･ HTML-melding';
 $labels['htmlonreplyandforward'] = 'ved vidaresending av eller svar pﾃ･ HTML-melding';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Vis fﾃｸrehandsvisningsboks';
 $labels['skin'] = 'Bunad';
 $labels['logoutclear'] = 'Fjern alt i ﾂｫsletta elementﾂｻ ved utlogging';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Fjern den original signatur frﾃ･ eposten nﾃ･r
 $labels['autoaddsignature'] = 'Legg signatur til automatisk';
 $labels['newmessageonly'] = 'berre pﾃ･ nye epostar';
 $labels['replyandforwardonly'] = 'berre pﾃ･ svar og vidaresending';
-$labels['replysignaturepos'] = 'Nﾃ･r du svarar eller sender vidare, plasser signaturen';
-$labels['belowquote'] = 'nedanfor siteringa';
-$labels['abovequote'] = 'oppanfor siteringa';
 $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread']  = 'Merk forehandsviste epostar som leste';
 $labels['afternseconds']  = 'etter $n sekund';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index e82beaf93..3dce30b98 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databasefeil!';
 $messages['requesttimedout'] = 'Fﾃｸrespurnaden fekk tidsavbrot';
 $messages['errorreadonly'] = 'Klarte ikkje utfﾃｸra handlinga. Mappa kan berre lesast.';
 $messages['errornoperm'] = 'Klarte ikkje utfﾃｸra handlinga. Nekta tilgang.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Eg forstﾃ･r ingen ting! Ingen data lagra.';
 $messages['invalidhost'] = 'Ugyldig tenarnamn.';
 $messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa.';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 47a00f645..426ac381e 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiuj';
 $labels['move']     = 'Przenieﾅ�';
 $labels['moveto']   = 'Przenieﾅ� do...';
 $labels['download'] = 'Pobierz';
+$labels['open']     = 'Otwﾃｳrz';
 $labels['showattachment'] = 'Pokaﾅｼ';
 $labels['showanyway'] = 'Pokaﾅｼ';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Bieﾅｼﾄ�ca strona';
 $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';
 $labels['unanswered'] = 'Bez odpowiedzi';
+$labels['withattachment'] = 'Z zaﾅて�cznikiem';
 $labels['deleted'] = 'Usuniﾄ冲e';
 $labels['undeleted'] = 'Nieusuniﾄ冲e';
 $labels['invert'] = 'Odwrﾃｳﾄ�';
@@ -204,6 +206,8 @@ $labels['body']  = 'Treﾅ崙�';
 
 $labels['openinextwin'] = 'Otwﾃｳrz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
+$labels['changeformattext'] = 'Wyﾅ孩ietl w formacie tekstowym';
+$labels['changeformathtml'] = 'Wyﾅ孩ietl w formacie HTML';
 
 // message compose
 $labels['editasnew']      = 'Edytuj jako nowﾄ�';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Twﾃｳrz wiadomoﾅ嫩i HTML';
 $labels['htmlonreply'] = 'tylko w odpowiedzi na wiadomoﾅ崙� HTML';
 $labels['htmlonreplyandforward'] = 'podczas przesyﾅＢnia dalej lub odpowiedzi na wiadomoﾅ崙� HTML';
 $labels['htmlsignature'] = 'Podpis w HTML';
+$labels['showemail'] = 'Pokazuj adres e-mail wraz z nazwﾄ�/opisem';
 $labels['previewpane'] = 'Pokaﾅｼ podglﾄ�d wiadomoﾅ嫩i';
 $labels['skin'] = 'Wyglﾄ�d interfejsu';
 $labels['logoutclear'] = 'Przy wylogowaniu oprﾃｳﾅｼnij Kosz';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Podczas odpowiedzi usuﾅ� podpis z cytowanej t
 $labels['autoaddsignature'] = 'Automatycznie wstaw podpis';
 $labels['newmessageonly'] = 'tylko dla nowych wiadomoﾅ嫩i';
 $labels['replyandforwardonly'] = 'tylko dla przekazywania i odpowiedzi';
-$labels['replysignaturepos'] = 'Podczas odpowiedzi wstaw podpis';
-$labels['belowquote'] = 'poniﾅｼej cytowanej treﾅ嫩i';
-$labels['abovequote'] = 'ponad cytowanﾄ� treﾅ嫩iﾄ�';
 $labels['insertsignature'] = 'Wstaw podpis';
 $labels['previewpanemarkread']  = 'Oznacz podglﾄ�dane wiadomoﾅ嫩i jako przeczytane';
 $labels['afternseconds']  = 'po $n sekundach';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 68e33fa1b..fb7ad6c97 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Bﾅて�d bazy danych!';
 $messages['requesttimedout'] = 'UpﾅＺnﾄ�ﾅ� limit czasu ﾅｼﾄ�dania';
 $messages['errorreadonly'] = 'Nie moﾅｼna wykonaﾄ� operacji. Folder tylko do odczytu.';
 $messages['errornoperm'] = 'Nie moﾅｼna wykonaﾄ� operacji. Brak uprawnieﾅ�.';
+$messages['erroroverquota'] = 'Nie moﾅｼna wykonaﾄ� operacji. Brak miejsca na dysku.';
+$messages['erroroverquotadelete'] = 'Brak miejsca na dysku. Uﾅｼyj SHIFT+DEL aby usunﾄ�ﾄ� wiadomoﾅ崙�.';
 $messages['invalidrequest'] = 'Bﾅて囘ne ﾅｼﾄ�danie! Nie zapisano danych.';
 $messages['invalidhost'] = 'Bﾅて囘na nazwa serwera.';
 $messages['nomessagesfound'] = 'Brak wiadomoﾅ嫩i w skrzynce.';
@@ -43,7 +45,7 @@ $messages['sendingmessage'] = 'WysyﾅＢnie wiadomoﾅ嫩i...';
 $messages['messagesent'] = 'Wiadomoﾅ崙� zostaﾅＢ wysﾅＢna.';
 $messages['savingmessage'] = 'Zapisywanie wiadomoﾅ嫩i...';
 $messages['messagesaved'] = 'Wiadomoﾅ崙� zostaﾅＢ zapisana w folderze Kopie robocze.';
-$messages['successfullysaved'] = 'Zapisano.';
+$messages['successfullysaved'] = 'Zapisano pomyﾅ嬪nie.';
 $messages['addedsuccessfully'] = 'Kontakt zostaﾅ� dodany.';
 $messages['contactexists'] = 'Kontakt o podanym adresie e-mail juﾅｼ istnieje!';
 $messages['contactnameexists'] = 'Kontakt z podanﾄ� nazwﾄ� juﾅｼ istnieje!';
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 93943947a..262e3d490 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾙ�ﾙ�ﾛ切ｳﾙ�';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ﾘｪﾙ� ﾘｮﾙ移�ﾙ異�';
 $labels['download'] = 'ﾚ壗ｩﾘｪﾙ� ﾚｩﾙ異�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'ﾙ�ﾘｧﾙ�ﾙ畏ｳﾘｪﾙ�';
 $labels['flagged'] = 'ﾘｨﾛ� ﾚｩﾘｧﾘｱﾙ�';
 $labels['unanswered'] = 'ﾙ�ﾘｧﾚ�ﾙ畏ｧﾘｨ ﾘｴﾙ異�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'ﾙｾﾙ� ﾙ�ﾙ異� ﾚｩﾚ頓ｩﾛ� ﾚｩﾛ� ﾙｾﾘｱﾘｧﾙ�ﾙ韓ｲﾙ�';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾘｧﾙ舘� ﾙｼﾙ岩�鈷ｧﾙ� ﾘｧﾙ館� ﾘｧﾘｳﾘｪﾙ畏ｲﾙ� ﾙ異�ﾙ舘ｩﾙ�';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ﾘｧﾙ舘� ﾙｼﾙ� ﾘｧﾙ� ﾘｧﾙ館� ﾙ�ﾘｧﾘｳﾙ�ﾙ舘ｩ';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾙｾﾘｮﾙ畏ｧﾙ�ﾛ� ﾚ�ﾙ移ｩﾘｧﾙｼ ﾙ移壑館館�';
 $labels['skin'] = 'ﾘｧﾙ�ﾙｼﾘｱﾙ�ﾙ韓ｳ ﾘｨﾚｼﾙ�';
 $labels['logoutclear'] = 'ﾚｩﾘｫﾘｧﾙ�ﾘｪ ﾘｯﾘｧﾙ�ﾙ� ﾘｯ ﾙ畏ｪﾙ�ﾛ� ﾙｾﾙ� ﾙ畏ｮﾘｪ ﾚｩﾛ� ﾙｾﾘｧﾚｩﾙ� ﾚｩﾚ遁�';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index c133b8c0e..d3a8483ee 100755
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ﾙ�ﾙ舘ｩﾘｨﾚｩﾘｳ ﾚｩﾛ� ﾙ�ﾛ接� ﾘｧﾘｳﾘｪﾙ畏ｲﾙ� ﾙ異�ﾙ� ﾙ�ﾙ異�ﾘｯﾙ�';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 1d28088a3..9a1946eee 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover para...';
 $labels['download'] = 'Baixar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Exibir';
 $labels['showanyway'] = 'Exibir mesmo assim';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pﾃ｡gina atual';
 $labels['unread'] = 'Nﾃ｣o lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Nﾃ｣o respondidas';
+$labels['withattachment'] = 'Com anexo';
 $labels['deleted'] = 'Excluﾃｭdas';
 $labels['undeleted'] = 'Nﾃ｣o excluﾃｭdas';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Conteﾃｺdo';
 
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
+$labels['changeformattext'] = 'Exibir em formato de texto simples';
+$labels['changeformathtml'] = 'Exibir com formataﾃｧﾃ｣o HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como novo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Criar mensagens em HTML';
 $labels['htmlonreply'] = 'em resposta ﾃ� mensagem em HTML somente';
 $labels['htmlonreplyandforward'] = 'em resposta ou encaminhamento de mensagem em HTML';
 $labels['htmlsignature'] = 'Assinatura em HTML';
+$labels['showemail'] = 'Exibir o endereﾃｧo de email junto ao nome de exibiﾃｧﾃ｣o';
 $labels['previewpane'] = 'Exibir prﾃｩ-visualizaﾃｧﾃ｣o';
 $labels['skin'] = 'Aparﾃｪncia da interface (tema)';
 $labels['logoutclear'] = 'Esvaziar a Lixeira ao sair';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Remover assinatura original da mensagem ao re
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
 $labels['newmessageonly'] = 'somente em novas mensagens';
 $labels['replyandforwardonly'] = 'somente em respostas e encaminhamentos';
-$labels['replysignaturepos'] = 'Inserir assinatura ao responder ou encaminhar';
-$labels['belowquote'] = 'abaixo da citaﾃｧﾃ｣o';
-$labels['abovequote'] = 'acima da citaﾃｧﾃ｣o';
 $labels['insertsignature'] = 'Inserir assinatura';
 $labels['previewpanemarkread']  = 'Marcar mensagens prﾃｩ-visualizadas como lidas';
 $labels['afternseconds']  = 'depois de $n segundos';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index f734c7fbd..6ec481b8f 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Erro no banco de dados!';
 $messages['requesttimedout'] = 'Tempo da requisiﾃｧﾃ｣o esgotado';
 $messages['errorreadonly'] = 'Nﾃ｣o foi possﾃｭvel realizar a operaﾃｧﾃ｣o. Pasta somente leitura';
 $messages['errornoperm'] = 'Nﾃ｣o foi possﾃｭvel realizar a operaﾃｧﾃ｣o. Acesso negado';
+$messages['erroroverquota'] = 'Nﾃ｣o foi possﾃｭvel realizar a operaﾃｧﾃ｣o. Nﾃ｣o hﾃ｡ espaﾃｧo disponﾃｭvel.';
+$messages['erroroverquotadelete'] = 'Nﾃ｣o hﾃ｡ espaﾃｧo disponﾃｭvel. Utilize SHIFT+DEL para apagar a mensagem.';
 $messages['invalidrequest'] = 'Requisiﾃｧﾃ｣o invﾃ｡lida! Nenhum dado foi salvo.';
 $messages['invalidhost'] = 'Endereﾃｧo de servidor invﾃ｡lido.';
 $messages['nomessagesfound'] = 'Nenhuma mensagem encontrada nessa caixa de mensagens';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 20105a348..316255e5e 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'mover para...';
 $labels['download'] = 'descarregar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar na mesma';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pﾃ｡gina actual';
 $labels['unread'] = 'Nﾃ｣o lidas';
 $labels['flagged'] = 'Sinalizadas';
 $labels['unanswered'] = 'Nﾃ｣o respondidas';
+$labels['withattachment'] = 'Com anexo';
 $labels['deleted'] = 'Eliminadas';
 $labels['undeleted'] = 'Nﾃ｣o eliminada';
 $labels['invert'] = 'Inverter selecﾃｧﾃ｣o';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corpo';
 
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
+$labels['changeformattext'] = 'Mostrar em formato de texto simples';
+$labels['changeformathtml'] = 'Mostrar em formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nova';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Escrever mensagens em HTML';
 $labels['htmlonreply'] = 'apenas em resposta a mensagens HTML';
 $labels['htmlonreplyandforward'] = 'no reencaminhamento ou resposta de mensagem em HTML';
 $labels['htmlsignature'] = 'Assinatura em HTML';
+$labels['showemail'] = 'Mostrar endereﾃｧo de e-mail com o nome a exibir';
 $labels['previewpane'] = 'Mostrar prﾃｩ-visualizaﾃｧﾃ｣o';
 $labels['skin'] = 'Aspecto [tema]';
 $labels['logoutclear'] = 'Esvaziar a Reciclagem ao sair';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Ao responder, remover a assinatura original d
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
 $labels['newmessageonly'] = 'apenas em novas mensagens';
 $labels['replyandforwardonly'] = 'apenas em respostas e reenvios';
-$labels['replysignaturepos'] = 'Ao responder ou reencaminhar colocar assinatura';
-$labels['belowquote'] = 'depois da citaﾃｧﾃ｣o';
-$labels['abovequote'] = 'antes da citaﾃｧﾃ｣o';
 $labels['insertsignature'] = 'Inserir assinatura';
 $labels['previewpanemarkread']  = 'Marcar mensagem como lida';
 $labels['afternseconds']  = 'apﾃｳs $n segundos';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index 638b0fcdd..88b96e60e 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Erro na base de dados!';
 $messages['requesttimedout'] = 'A solicitaﾃｧﾃ｣o expirou';
 $messages['errorreadonly'] = 'Nﾃ｣o foi possﾃｭvel efectuar a operaﾃｧﾃ｣o. A pasta ﾃｩ sﾃｳ de leitura.';
 $messages['errornoperm'] = 'Nﾃ｣o tem permissﾃｵes para efectuar esta operaﾃｧﾃ｣o.';
+$messages['erroroverquota'] = 'Nﾃ｣o foi possﾃｭvel executar a operaﾃｧﾃ｣o. Nﾃ｣o hﾃ｡ espaﾃｧo livre em disco.';
+$messages['erroroverquotadelete'] = 'Nﾃ｣o hﾃ｡ espaﾃｧo livre em disco. Use SHIFT + DEL para eliminar algumas mensagens.';
 $messages['invalidrequest'] = 'Pedido invﾃ｡lido! Nﾃ｣o foi guardada nenhuma informaﾃｧﾃ｣o.';
 $messages['invalidhost'] = 'Nome do servidor invﾃ｡lido.';
 $messages['nomessagesfound'] = 'Nﾃ｣o existem mensagens nesta pasta.';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 00ec11f13..6b59da313 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiazﾄ�';
 $labels['move']     = 'Mutﾄ�';
 $labels['moveto']   = 'Mutﾄ� in...';
 $labels['download'] = 'Descarcﾄ�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Aratﾄ�';
 $labels['showanyway'] = 'Aratﾄ� oricum';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pagina curentﾄ�';
 $labels['unread'] = 'Necitite';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'Fﾄビﾄ� rﾄピpuns';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾅ柎erse';
 $labels['undeleted'] = 'Nu a fost ﾈ冲ers';
 $labels['invert'] = 'Inverseazﾄ�';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corp';
 
 $labels['openinextwin'] = 'Deschide ﾃｮntr-o fereastrﾄ� nouﾄ�';
 $labels['emlsave'] = 'Salveazﾄ� ﾃｮn format .eml';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editeazﾄ� ca nou';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Scrie mesaje HTML';
 $labels['htmlonreply'] = 'la rﾄピpunsul doar cﾄフre un mesaj HTML';
 $labels['htmlonreplyandforward'] = 'la trimitere mai departe sau la rﾄピpuns la mesaj HTML';
 $labels['htmlsignature'] = 'Semnaturﾄ� HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Previzualizare mail';
 $labels['skin'] = 'Temﾄ� interfaﾅ｣ﾄ�';
 $labels['logoutclear'] = 'Goleﾅ殳e Coﾅ殷l de Gunoi la deconectare';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Cﾃ｢nd rﾄピpundeﾅ｣i, se ﾅ殳erge semnﾄフura ori
 $labels['autoaddsignature'] = 'Adﾄブgarea automatﾄ� a semnﾄフurii';
 $labels['newmessageonly'] = 'numai la mesajele noi';
 $labels['replyandforwardonly'] = 'numai la rﾄピpunsuri si cele trimise mai departe';
-$labels['replysignaturepos'] = 'Cﾃ｢nd rﾄピpundeﾅ｣i sau trimiteﾅ｣i mai departe, semnﾄフura se va plasa';
-$labels['belowquote'] = 'dedesubtul citatului';
-$labels['abovequote'] = 'deasupra citatului';
 $labels['insertsignature'] = 'Introduce o semnﾄフurﾄ�';
 $labels['previewpanemarkread']  = 'Marcheazﾄ� mesajele previzualizate ca citite';
 $labels['afternseconds']  = 'dupﾄ� $n secunde';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 68d1ab6a7..96b9de593 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Eroare bazﾄ� de date!';
 $messages['requesttimedout'] = 'Timpul alocat cereri a expirat';
 $messages['errorreadonly'] = 'Nu se poate efectua operaﾅ｣ia. Dosarul este doar-citire.';
 $messages['errornoperm'] = 'Nu se poate efectua operaﾅ｣ia. Acces interzis.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Solicitare invalidﾄ�! Datele nu au fost salvate.';
 $messages['invalidhost'] = 'Hosname invalid';
 $messages['nomessagesfound'] = 'Nu a fost gﾄピit nici un mesaj ﾃｮn aceastﾄ� cﾄピuﾅ｣ﾄ� poﾅ殳alﾄ�';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 9d854450a..8a136aa77 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾐ墟ｾﾐｿﾐｸﾑ�ﾐｾﾐｲﾐｰﾑび�';
 $labels['move']     = 'ﾐ渙ｵﾑ�ﾐｵﾐｼﾐｵﾑ�ﾑひｸﾑび�';
 $labels['moveto']   = 'ﾐ渙ｵﾑ�ﾐｵﾐｼﾐｵﾑ�ﾑひｸﾑび� ﾐｲ...';
 $labels['download'] = 'ﾐ厘ｰﾐｳﾑ�ﾑσｷﾐｸﾑび�';
+$labels['open']     = 'ﾐ樮ひｺﾑ�ﾑ錦び�';
 $labels['showattachment'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｰﾑび�';
 $labels['showanyway'] = 'ﾐ柘�ﾐｵ ﾑ�ﾐｰﾐｲﾐｽﾐｾ ﾐｿﾐｾﾐｺﾐｰﾐｷﾐｰﾑび�';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾐ｢ﾐｵﾐｺﾑτ禍ｰﾑ� ﾑ�ﾑび�ﾐｰﾐｽﾐｸﾑ�ﾐｰ';
 $labels['unread'] = 'ﾐ斷ｵﾐｿﾑ�ﾐｾﾑ�ﾐｸﾑひｰﾐｽﾐｽﾑ巾ｵ';
 $labels['flagged'] = 'ﾐ渙ｾﾐｼﾐｵﾑ�ﾐｵﾐｽﾐｽﾑ巾ｵ';
 $labels['unanswered'] = 'ﾐ斷ｵﾐｾﾑひｲﾐｵﾑ�ﾐｵﾐｽﾐｽﾑ巾ｵ';
+$labels['withattachment'] = 'ﾐ｡ ﾐｲﾐｻﾐｾﾐｶﾐｵﾐｽﾐｸﾐｵﾐｼ';
 $labels['deleted'] = 'ﾐ｣ﾐｴﾐｰﾐｻﾐｵﾐｽﾐｽﾐｾﾐｵ';
 $labels['undeleted'] = 'ﾐ斷ｵ ﾑσｴﾐｰﾐｻﾐｵﾐｽﾐｾ';
 $labels['invert'] = 'ﾐ侑ｽﾐｲﾐｵﾑ�ﾑひｽﾐｾﾐｵ';
@@ -204,6 +206,8 @@ $labels['body']  = 'ﾐ｢ﾐｵﾐｻﾐｾ ﾐｿﾐｸﾑ�ﾑ糊ｼﾐｰ';
 
 $labels['openinextwin'] = 'ﾐ樮ひｺﾑ�ﾑ錦び� ﾐｲ ﾐｽﾐｾﾐｲﾐｾﾐｼ ﾐｾﾐｺﾐｽﾐｵ';
 $labels['emlsave'] = 'ﾐ｡ﾐｾﾑ�ﾑ�ﾐｰﾐｽﾐｸﾑび� (.eml)';
+$labels['changeformattext'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｰﾑび� ﾐｲ ﾑ�ﾐｾﾑ�ﾐｼﾐｰﾑひｵ ﾐｾﾐｱﾑ錦�ﾐｽﾐｾﾐｳﾐｾ ﾑひｵﾐｺﾑ�ﾑひｰ';
+$labels['changeformathtml'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｰﾑび� ﾐｲ HTML ﾑ�ﾐｾﾑ�ﾐｼﾐｰﾑひｵ';
 
 // message compose
 $labels['editasnew']      = 'ﾐ�ﾐｵﾐｴﾐｰﾐｺﾑひｸﾑ�ﾐｾﾐｲﾐｰﾑび� ﾐｺﾐｰﾐｺ ﾐｽﾐｾﾐｲﾐｾﾐｵ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾐ｡ﾐｾﾐｷﾐｴﾐｰﾐｲﾐｰﾑび� ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ� ﾐｲ HTML';
 $labels['htmlonreply'] = 'ﾑひｾﾐｻﾑ糊ｺﾐｾ ﾐｲ ﾐｾﾑひｲﾐｵﾑ� ﾐｽﾐｰ ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｵ ﾐｲ HTML';
 $labels['htmlonreplyandforward'] = 'ﾐｿﾑ�ﾐｸ ﾐｿﾐｵﾑ�ﾐｵﾑ�ﾑ巾ｻﾐｺﾐｵ ﾐｸﾐｻﾐｸ ﾐｾﾑひｲﾐｵﾑひｵ ﾐｽﾐｰ HTML ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｵ';
 $labels['htmlsignature'] = 'ﾐ渙ｾﾐｴﾐｿﾐｸﾑ�ﾑ� ﾐｲ HTML';
+$labels['showemail'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾑ巾ｲﾐｰﾑび� ﾐｰﾐｴﾑ�ﾐｵﾑ� ﾑ災ｻﾐｵﾐｺﾑび�ﾐｾﾐｽﾐｽﾐｾﾐｹ ﾐｿﾐｾﾑ�ﾑび� ﾐｸ ﾐｸﾐｼﾑ� ﾐｰﾐｴﾑ�ﾐｵﾑ�ﾐｰﾑひｰ';
 $labels['previewpane'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｰﾑび� ﾐｿﾐｰﾐｽﾐｵﾐｻﾑ� ﾐｿﾑ�ﾐｵﾐｲﾑ袴�';
 $labels['skin'] = 'ﾐ｡ﾑひｸﾐｻﾑ� ﾐｾﾑ�ﾐｾﾑ�ﾐｼﾐｻﾐｵﾐｽﾐｸﾑ�';
 $labels['logoutclear'] = 'ﾐ樮�ﾐｸﾑ禍ｰﾑび� ﾐｺﾐｾﾑ�ﾐｷﾐｸﾐｽﾑ� ﾐｿﾑ�ﾐｸ ﾐｲﾑ錦�ﾐｾﾐｴﾐｵ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾐ｣ﾐｴﾐｰﾐｻﾐｸﾑび� ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ�ﾑ� ﾐｿﾑ�ﾐｸ ﾐｾﾑひｲﾐｵ
 $labels['autoaddsignature'] = 'ﾐ籍ｲﾑひｾﾐｼﾐｰﾑひｸﾑ�ﾐｵﾑ�ﾐｺﾐｸ ﾐｴﾐｾﾐｱﾐｰﾐｲﾐｻﾑ肖び� ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ�ﾑ�';
 $labels['newmessageonly'] = 'ﾑひｾﾐｻﾑ糊ｺﾐｾ ﾐｲ ﾐｽﾐｾﾐｲﾑ錦� ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ肖�';
 $labels['replyandforwardonly'] = 'ﾑひｾﾐｻﾑ糊ｺﾐｾ ﾐｲ ﾐｾﾑひｲﾐｵﾑひｰﾑ� ﾐｸ ﾐｿﾐｵﾑ�ﾐｵﾑ�ﾑ巾ｻﾐｺﾐｰﾑ�';
-$labels['replysignaturepos'] = 'ﾐ湲�ﾐｸﾐｺﾑ�ﾐｵﾐｿﾐｸﾑび� ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ�ﾑ� ﾐｿﾑ�ﾐｸ ﾐｾﾑひｲﾐｵﾑひｵ ﾐｸ ﾐｿﾐｵﾑ�ﾐｵﾑ�ﾑ巾ｻﾐｺﾐｵ';
-$labels['belowquote'] = 'ﾐｿﾐｾﾑ�ﾐｻﾐｵ ﾑ�ﾐｸﾑひｰﾑび�';
-$labels['abovequote'] = 'ﾐｴﾐｾ ﾑ�ﾐｸﾑひｰﾑび�';
 $labels['insertsignature'] = 'ﾐ柘�ﾑひｰﾐｲﾐｸﾑび� ﾐｿﾐｾﾐｴﾐｿﾐｸﾑ�ﾑ�';
 $labels['previewpanemarkread']  = 'ﾐ樮ひｼﾐｵﾑ�ﾐｰﾑび� ﾐｿﾑ�ﾐｾﾑ�ﾐｼﾐｾﾑび�ﾐｵﾐｽﾐｽﾑ巾ｵ ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ� ﾐｺﾐｰﾐｺ ﾐｿﾑ�ﾐｾﾑ�ﾐｸﾑひｰﾐｽﾐｽﾑ巾ｵ';
 $labels['afternseconds']  = 'ﾑ�ﾐｵﾑ�ﾐｵﾐｷ $n ﾑ�ﾐｵﾐｺﾑσｽﾐｴ';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 0693887c0..f9c8c433a 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾐ樮威ｸﾐｱﾐｺﾐｰ ﾐｱﾐｰﾐｷﾑ� ﾐｴﾐｰﾐｽﾐｽﾑ錦�!';
 $messages['requesttimedout'] = 'ﾐ湲�ﾐｵﾐｲﾑ錦威ｵﾐｽﾐｾ ﾐｲﾑ�ﾐｵﾐｼﾑ� ﾐｾﾐｶﾐｸﾐｴﾐｰﾐｽﾐｸﾑ� ﾐｷﾐｰﾐｿﾑ�ﾐｾﾑ�ﾐｰ';
 $messages['errorreadonly'] = 'ﾐ斷ｵﾐｲﾐｾﾐｷﾐｼﾐｾﾐｶﾐｽﾐｾ ﾐｲﾑ巾ｿﾐｾﾐｻﾐｽﾐｸﾑび� ﾐｾﾐｿﾐｵﾑ�ﾐｰﾑ�ﾐｸﾑ�. ﾐ渙ｰﾐｿﾐｺﾐｰ ﾐｴﾐｾﾑ�ﾑびσｿﾐｽﾐｰ ﾑひｾﾐｻﾑ糊ｺﾐｾ ﾐｴﾐｻﾑ� ﾑ�ﾑひｵﾐｽﾐｸﾑ�';
 $messages['errornoperm'] = 'ﾐ斷ｵﾐｲﾐｾﾐｷﾐｼﾐｾﾐｶﾐｽﾐｾ ﾐｲﾑ巾ｿﾐｾﾐｻﾐｽﾐｸﾑび� ﾐｾﾐｿﾐｵﾑ�ﾐｰﾑ�ﾐｸﾑ�. ﾐ頒ｾﾑ�ﾑびσｿ ﾐｷﾐｰﾐｿﾑ�ﾐｵﾑ禾岱ｽ';
+$messages['erroroverquota'] = 'ﾐ斷ｵﾐｲﾐｾﾐｷﾐｼﾐｾﾐｶﾐｽﾐｾ ﾐｲﾑ巾ｿﾐｾﾐｻﾐｽﾐｸﾑび� ﾐｾﾐｿﾐｵﾑ�ﾐｰﾑ�ﾐｸﾑ�. ﾐ斷ｵﾑ� ﾑ�ﾐｲﾐｾﾐｱﾐｾﾐｴﾐｽﾐｾﾐｳﾐｾ ﾐｼﾐｵﾑ�ﾑひｰ ﾐｽﾐｰ ﾐｴﾐｸﾑ�ﾐｺﾐｵ.';
+$messages['erroroverquotadelete'] = 'ﾐ斷ｵﾑ� ﾑ�ﾐｲﾐｾﾐｱﾐｾﾐｴﾐｽﾐｾﾐｳﾐｾ ﾐｼﾐｵﾑ�ﾑひｰ ﾐｽﾐｰ ﾐｴﾐｸﾑ�ﾐｺﾐｵ. ﾐ佯�ﾐｿﾐｾﾐｻﾑ糊ｷﾑσｹﾑひｵ SHIFT+DEL ﾐｴﾐｻﾑ� ﾑσｴﾐｰﾐｻﾐｵﾐｽﾐｸﾑ� ﾑ�ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾑ�.';
 $messages['invalidrequest'] = 'ﾐ斷ｵﾐｲﾐｵﾑ�ﾐｽﾑ巾ｹ ﾐｷﾐｰﾐｿﾑ�ﾐｾﾑ�! ﾐ侑ｽﾑ�ﾐｾﾑ�ﾐｼﾐｰﾑ�ﾐｸﾑ� ﾐｽﾐｵ ﾑ�ﾐｾﾑ�ﾑ�ﾐｰﾐｽﾐｵﾐｽﾐｰ.';
 $messages['invalidhost'] = 'ﾐ斷ｵﾐｲﾐｵﾑ�ﾐｽﾐｾﾐｵ ﾐｸﾐｼﾑ� ﾑ�ﾐｵﾑ�ﾐｲﾐｵﾑ�ﾐｰ.';
 $messages['nomessagesfound'] = 'ﾐ｡ﾐｾﾐｾﾐｱﾑ禍ｵﾐｽﾐｸﾐｹ ﾐｽﾐｵ ﾐｽﾐｰﾐｹﾐｴﾐｵﾐｽﾐｾ';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 3d1dfccdb..d8cd71662 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '犖ｴ犢亭ｶｧ犖ｴ犖ｭ犢� 犖壟ｶｻ犖ｱ犢癌ｶｱ';
 $labels['move']     = '犖憫ｷ吭ｶｱ犖ｺ犖ｱ犢癌ｶｱ';
 $labels['moveto']   = '犖憫ｷ吭ｶｱ 犖ｺ犖ｱ犢癌ｶｱ...';
 $labels['download'] = '犖ｶ犢鐘ｶ憫ｶｭ 犖壟ｶｻ犖ｱ犢癌ｶｱ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '犖ｯ犢説ｶｱ犖ｧ 犖�犖ｭ犢� 犖ｴ犢亭ｶｧ犢扉ｷ�';
 $labels['unread'] = '犖ｱ犢憫ｶ壟ｷ亭ｶｺ犢�犢�';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '犖ｸ犖壟ｷ� 犖ｯ犢説ｶｸ犢�';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = '犖ｱ犢� 犖壟ｷ�犢扉ｷ�犢扉ｷ�犖� 犢�犢亭ｷ�犢倨ｶｭ 犖壟ｶｻ犖ｱ犢癌ｶｱ';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML 犖ｴ犖ｫ犢亭ｷ�犢亭ｶｩ犖ｺ犖壟ｷ� 犢�犢隊ｶｯ犢内ｶｸ';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML 犖�犖ｭ犢癌ｷ�犖ｱ';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '犖ｴ犢籾ｶｻ犢癌ｷ�犖ｯ犖ｻ犢癌ｷ≒ｶｱ 犖壟ｷ憫ｶｧ犢� 犖ｴ犢吭ｶｱ犢癌ｶｱ犖ｱ犢癌ｶｱ';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = '犢�犢癌ｷ�犖ｺ犖もｶ壟ｷ岩�財ｶｻ犢内ｶｺ犢� 犖�犖ｭ犢癌ｷ�犖ｱ 犖�犖ｭ犢扉ｶｽ犖ｭ犢� 犖壟ｶｻ犖ｱ犢癌ｶｱ';
 $labels['newmessageonly'] = '犖�犖ｽ犢扉ｶｭ犢� 犖ｴ犖ｫ犢亭ｷ�犢亭ｶｩ犖ｺ 犖ｴ犖ｸ犖ｫ犖壟ｷ�';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = '犖�犖ｭ犢癌ｷ�犖ｱ 犖�犖ｭ犢扉ｶｽ犖ｭ犢� 犖壟ｶｻ犖ｱ犢癌ｶｱ';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '犖ｭ犖ｭ犢癌ｶｴ犖ｻ $n犖壟ｶｧ 犖ｴ犢�犢�';
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index b8ecab335..c3828bc64 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '犖ｯ犖ｭ犢癌ｶｭ 犖憫ｶｶ犖ｩ犢鐘ｷ�犢� 犖ｯ犢杳ｷもｶｺ!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '犖ｽ犢亭ｶｺ犢扉ｶｸ犢� 犖ｴ犢吭ｶｧ犢癌ｶｧ犢亭ｶｺ犢� 犖ｴ犖ｱ犢亭ｷ�犢扉ｶｩ 犖ｱ犢説ｶｭ';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 702131d7e..10673382a 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopﾃｭrovaﾅ･';
 $labels['move']     = 'Presunﾃｺﾅ･';
 $labels['moveto']   = 'presunﾃｺﾅ･ do...';
 $labels['download'] = 'stiahnuﾅ･';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuﾃ｡lna strﾃ｡nka';
 $labels['unread'] = 'Nepreﾄ催ｭtanﾃｩ';
 $labels['flagged'] = 'Oznaﾄ稿nﾃｩ';
 $labels['unanswered'] = 'Neoznaﾄ稿nﾃｩ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Zmazanﾃｩ';
 $labels['undeleted'] = 'Nevymazanﾃｩ';
 $labels['invert'] = 'Prevrﾃ｡tiﾅ･';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Otvoriﾅ･ v novom okne';
 $labels['emlsave'] = 'Stiahnuﾅ･';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Upraviﾅ･ ako novﾃｺ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Vytvoriﾅ･ HTML sprﾃ｡vu';
 $labels['htmlonreply'] = 'len v odpovedi na HTML sprﾃ｡vy';
 $labels['htmlonreplyandforward'] = 'pri preposielanﾃｭ alebo odpovedi na HTML sprﾃ｡vu';
 $labels['htmlsignature'] = 'HTML podpis';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Ukﾃ｡zaﾅ･ nﾃ｡hﾄｾad';
 $labels['skin'] = 'Vzhﾄｾad';
 $labels['logoutclear'] = 'Vyprﾃ｡zdniﾅ･ kﾃｴﾅ｡ pri odhlﾃ｡senﾃｭ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Pri odpovedanﾃｭ odstrﾃ｡niﾅ･ zo sprﾃ｡vy pﾃｴvod
 $labels['autoaddsignature'] = 'Automaticky pridaﾅ･ podpis';
 $labels['newmessageonly'] = 'iba k novﾃｽm sprﾃ｡vam';
 $labels['replyandforwardonly'] = 'len k odpovede a preposﾃｭlanej sprﾃ｡ve';
-$labels['replysignaturepos'] = 'Pri odpovedanﾃｭ alebo preposielanie sprﾃ｡vy vloﾅｾiﾅ･ podpis';
-$labels['belowquote'] = 'nad citﾃ｡ciu';
-$labels['abovequote'] = 'pod citﾃ｡ciu';
 $labels['insertsignature'] = 'Vloﾅｾit podpis';
 $labels['previewpanemarkread']  = 'Oznaﾄ絞ﾅ･ zobrazenej sprﾃ｡vy ako preﾄ催ｭtanﾃｩ';
 $labels['afternseconds']  = 'po $n sekundﾃ｡ch';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index f0ee82978..a6f319db6 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databﾃ｡zovﾃ｡ chyba!';
 $messages['requesttimedout'] = 'ﾄ径s poﾅｾiadavky vyprﾅ｡al';
 $messages['errorreadonly'] = 'Nemoﾅｾno vykonaﾅ･ operﾃ｡ciu. Adresﾃ｡r je len na ﾄ催ｭtanie';
 $messages['errornoperm'] = 'Nemoﾅｾno vykonaﾅ･ operﾃ｡ciu. Prﾃｭstup odmietnutﾃｽ';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Chybnﾃｽ poﾅｾiadavek. ﾅｽiadne ﾃｺdaje neboli uloﾅｾenﾃｩ.';
 $messages['invalidhost'] = 'Neplatnﾃｽ nﾃ｡zov servera';
 $messages['nomessagesfound'] = 'Vo Vaﾅ｡ej schrﾃ｡nke nie je ﾅｾiadna sprﾃ｡va';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index a4e2d43e3..6b9ba2d41 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -64,8 +64,9 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premakni';
 $labels['moveto']   = 'Premakni v...';
 $labels['download'] = 'Prenesi';
+$labels['open']     = 'Odpri';
 $labels['showattachment'] = 'Prikaﾅｾi';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = 'Prikaﾅｾi';
 
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Velikost datoteke';
@@ -161,8 +162,9 @@ $labels['currpage'] = 'Trenutna stran';
 $labels['unread'] = 'Neprebrano';
 $labels['flagged'] = 'Oznaﾄ稿no';
 $labels['unanswered'] = 'Neoznaﾄ稿no';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Izbrisano';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'Ni izbrisano';
 $labels['invert'] = 'Zamenjaj';
 $labels['filter'] = 'Prikaﾅｾi';
 $labels['list'] = 'Seznam';
@@ -200,10 +202,12 @@ $labels['quicksearch']  = 'Hitri iskalnik';
 $labels['resetsearch']  = 'Prekliﾄ絞 iskanje';
 $labels['searchmod']  = 'Spremembe iskanja';
 $labels['msgtext']  = 'Celotno sporoﾄ絞lo';
-$labels['body']  = 'Body';
+$labels['body']  = 'Vsebina sporoﾄ絞la';
 
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Uredi kot novo';
@@ -241,9 +245,9 @@ $labels['nosubject']  = '(brez naslova)';
 $labels['showimages'] = 'Prikaﾅｾi slike';
 $labels['alwaysshow'] = 'Vedno prikaﾅｾi slike od $sender';
 $labels['isdraft']    = 'To je osnutek sporoﾄ絞la.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['andnmore']   = '$nr veﾄ�...';
+$labels['togglemoreheaders'] = 'Prikaﾅｾi veﾄ� glav sporoﾄ絞la';
+$labels['togglefullheaders'] = 'Preklopi na neobdelan zapis glave sporoﾄ絞la';
 
 $labels['htmltoggle'] = 'Obogateno besedilo (HTML)';
 $labels['plaintoggle'] = 'Samo besedilo';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Sestavi sporoﾄ絞lo za';
 $labels['contactsfromto'] = 'Vizitke $from od $to do $count';
 $labels['print']          = 'Natisni';
 $labels['export']         = 'Izvozi';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Izvozi vse';
+$labels['exportsel']      = 'Izvozi oznaﾄ稿no';
 $labels['exportvcards']   = 'Izvozi stike v formatu vCard';
 $labels['newcontactgroup'] = 'Ustvari novo skupino stikov';
 $labels['grouprename']    = 'Preimenuj skupino';
@@ -360,7 +364,7 @@ $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove stike v imenik:';
 $labels['importreplace'] = 'Zamenjaj celoten imenik';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Stike lahko naloﾅｾite iz obstojeﾄ稿ga imenika. <br/>Trenutno je podprt uvoz stikov v zapisu  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ali v CSV (z vejico loﾄ稿ne vrednosti) zapisu.';
 $labels['done'] = 'Dokonﾄ溝no';
 
 // settings
@@ -380,8 +384,8 @@ $labels['edititem'] = 'Uredi predmet';
 $labels['preferhtml'] = 'Prednostno HTML';
 $labels['defaultcharset'] = 'Privzeto kodiranje znakov';
 $labels['htmlmessage'] = 'HTML sporoﾄ絞lo';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digitalni podpis';
 $labels['dateformat'] = 'Prikaz datuma';
 $labels['timeformat'] = 'Prikaz ﾄ溝sa';
 $labels['prettydate'] = 'Bolj ﾄ絞tljivi datumi';
@@ -393,11 +397,12 @@ $labels['pagesize']  = 'Vrstic na stran';
 $labels['signature'] = 'Podpis';
 $labels['dstactive']  = 'Samodejna nastavitev zimskega/letnega ﾄ溝sa';
 $labels['showinextwin'] = 'Odpri v novem oknu';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['composeextwin'] = 'Sestavi sporoﾄ絞lo v novem oknu';
 $labels['htmleditor'] = 'Sestavi sporoﾄ絞la z obogatenim besedilom';
 $labels['htmlonreply'] = 'le pri odgovoru na sporoﾄ絞la z obogatenim besedilom';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'le pri posredovanju ali odgovoru na sporoﾄ絞la z obogatenim besedilom';
 $labels['htmlsignature'] = 'Podpis z obogatenim besedilom';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prikaﾅｾi predogled';
 $labels['skin'] = 'Tema uporabniﾅ｡kega vmesnika';
 $labels['logoutclear'] = 'Izprazni mapo Smeti ob odjavi';
@@ -422,7 +427,7 @@ $labels['always'] = 'vedno';
 $labels['showinlineimages'] = 'Prikaﾅｾi priponke na dnu sporoﾄ絞la';
 $labels['autosavedraft']  = 'Samodejno shrani osnutke';
 $labels['everynminutes']  = '$n minut';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = 'Osveﾅｾi (preglej nova sporoﾄ絞la)';
 $labels['never']  = 'nikoli';
 $labels['immediately']  = 'takoj';
 $labels['messagesdisplaying'] = 'Prikazovanje sporoﾄ絞l';
@@ -444,23 +449,20 @@ $labels['maintenance'] = 'Vzdrﾅｾevanje';
 $labels['newmessage'] = 'Novo sporoﾄ絞lo';
 $labels['signatureoptions'] = 'Nastavitve podpisa';
 $labels['whenreplying'] = 'Pri odgovoru';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = 'ne navajaj izvornega sporoﾄ絞la v odgovoru';
 $labels['replytopposting'] = 'zaﾄ肱i z novim sporoﾄ絞lom nad izvornim sporoﾄ絞lom';
 $labels['replybottomposting'] = 'zaﾄ肱i z novim sporoﾄ絞lom pod izvornim sporoﾄ絞lom';
 $labels['replyremovesignature'] = 'Pri odgovoru na sporoﾄ絞lo odstrani izvorni podpis iz sporoﾄ絞la';
 $labels['autoaddsignature'] = 'Samodejno dodaj podpis';
 $labels['newmessageonly'] = 'samo novim sporoﾄ絞lom';
 $labels['replyandforwardonly'] = 'samo k odgovorom in posredovanim sporoﾄ絞lom';
-$labels['replysignaturepos'] = 'Pri odgovoru ali posredovanju sporoﾄ絞la vstavi podpis';
-$labels['belowquote'] = 'pod citiran tekst';
-$labels['abovequote'] = 'nad citiran tekst';
 $labels['insertsignature'] = 'Vstavi podpis';
 $labels['previewpanemarkread']  = 'Oznaﾄ絞 predogledana sporoﾄ絞la kot prebrana';
 $labels['afternseconds']  = 'po $n sekundah';
 $labels['reqmdn'] = 'Vedno zahtevaj povratnico';
 $labels['reqdsn'] = 'Vedno zahtevaj obvestilo o statusu dostave';
 $labels['replysamefolder'] = 'Shrani odgovore na sporoﾄ絞lo v mapo izvornega sporoﾄ絞la';
-$labels['defaultabook'] = 'Default address book';
+$labels['defaultabook'] = 'Privzeti stiki';
 $labels['autocompletesingle'] = 'Preskoﾄ絞 nadomestni e-naslov pri samodejnem dokonﾄ溝nju';
 $labels['listnamedisplay'] = 'Prikaﾅｾi seznam stikov kot';
 $labels['spellcheckbeforesend'] = 'Preveri ﾄ荒kovanje pred poﾅ｡iljanjem sporoﾄ絞la';
@@ -470,8 +472,8 @@ $labels['spellcheckignorenums'] = 'Ne upoﾅ｡tevaj besed, ki vsebujejo ﾅ｡tevilke';
 $labels['spellcheckignorecaps'] = 'Ne upoﾅ｡tevaj besed, ki vsebujejo samo velike ﾄ荒ke';
 $labels['addtodict'] = 'Dodaj v slovar';
 $labels['mailtoprotohandler'] = 'Registriraj upravljavca protokola za e-naslov: povezave';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
+$labels['forwardmode'] = 'Posredovanje sporoﾄ絞l';
+$labels['inline'] = 'medvrstiﾄ肱o';
 $labels['asattachment'] = 'Kot priponka';
 
 $labels['folder']  = 'Mapa';
@@ -500,7 +502,7 @@ $labels['sortasc']  = 'Uredi naraﾅ｡ﾄ溝joﾄ稿';
 $labels['sortdesc'] = 'Uredi padajoﾄ稿';
 $labels['undo'] = 'Prekliﾄ絞';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = 'Nameﾅ｡ﾄ稿ni vtiﾄ肱iki';
 $labels['plugin'] = 'Vtiﾄ肱ik';
 $labels['version'] = 'Razliﾄ絞ca';
 $labels['source'] = 'Vir';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 3fd113b0d..081d912c1 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Napaka v bazi';
 $messages['requesttimedout'] = 'Zahteva je potekla';
 $messages['errorreadonly'] = 'Operacije ni bilo mogoﾄ稿 izvrﾅ｡iti. Mapa je na voljo samo za branje.';
 $messages['errornoperm'] = 'Operacije ni bilo mogoﾄ稿 izvrﾅ｡iti. Dostop zavrnjen.';
+$messages['erroroverquota'] = 'Operacije ni mogoﾄ稿 izvrﾅ｡iti. Diskovni prostor je zaseden.';
+$messages['erroroverquotadelete'] = 'Zmanjkalo je diskovnega prostora. Za izbris sporoﾄ絞la porabite tipki SHIFT+DEL.';
 $messages['invalidrequest'] = 'Neveljavna zahteva. Podatki niso bili shranjeni.';
 $messages['invalidhost'] = 'Nepravilno ime streﾅｾnika';
 $messages['nomessagesfound'] = 'V poﾅ｡tnem predalu ni sporoﾄ絞l.';
@@ -119,7 +121,7 @@ $messages['selectimportfile'] = 'Izberite datoteko, ki jo ﾅｾelite prenesti';
 $messages['addresswriterror'] = 'Izbran imenik ni zapisljiv';
 $messages['contactaddedtogroup'] = 'Stik je bil uspeﾅ｡no dodan v skupino';
 $messages['contactremovedfromgroup'] = 'Stik je bil uspeﾅ｡no izbrisan iz skupine';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'Dodeljevanje skupini ni bilo spremenjeno.';
 $messages['importwait'] = 'Uvaﾅｾanje poteka...';
 $messages['importformaterror'] = 'Uvoz ni uspel! Uvoﾅｾena datoteka ni pravega formata.';
 $messages['importconfirm'] = '<b>Uspeﾅ｡no uvoﾅｾeni $inserted stiki, $skipped stikov ﾅｾe obstaja v imeniku</b>:<p><em>$names</em></p>';
@@ -163,7 +165,7 @@ $messages['invalidimageformat'] = 'Neveljaven format slike';
 $messages['mispellingsfound'] = 'V sporoﾄ絞lu so bile najdene napake v ﾄ荒kovanju';
 $messages['parentnotwritable'] = 'Podmape v tej mapi ni bilo mogoﾄ稿 ustvariti/premakniti. Nimate pravic.';
 $messages['messagetoobig'] = 'Sporoﾄ絞lo je preveliko za obdelavo.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['attachmentvalidationerror'] = 'OPOZORILO! Priponka vsebuje sumljivo vsebino, saj tip priponke ne ustreza tipu, doloﾄ稿nemu v sporoﾄ絞lu. ﾄ憩 ne zaupate poﾅ｡iljatelju, priponke v brskalniku ne odpirajte, saj lahko vsebuje zlonamerno vsebino. <br/><br/><em>Priﾄ溝kovano: $expected; Najdeno: $detected</em>';
 $messages['noscriptwarning'] = 'Opozorilo: Ta spletna stran zahteva Javascript! Za uporabo jo vkljuﾄ絞te v nastavitvah vaﾅ｡ega brskalnika.';
 
 ?>
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index aa102670c..ba9b559d8 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopje';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ﾃｧo te...';
 $labels['download'] = 'shkarko';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Palexuar';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Shkruaj mesazhe HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Nﾃｫnshkrimi HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Shiko si duket';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index 46e7197e0..56bb9feb2 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nuk ka mesazhe nﾃｫ kﾃｫtﾃｫ kuti postare';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 1461606eb..130d3a7a6 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾐ墟ｾﾐｿﾐｸﾑ�ﾐｰﾑ�';
 $labels['move']     = 'ﾐ湲�ﾐｵﾐｱﾐｰﾑ�ﾐｸ';
 $labels['moveto']   = 'ﾐ湲�ﾐｵﾐｱﾐｰﾑ�ﾐｸ ﾑ�...';
 $labels['download'] = 'ﾐ湲�ﾐｵﾑσｷﾐｼﾐｸ (ﾑ�ﾐｺﾐｸﾐｴﾐｰﾑ墟ｵ)';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾐ｢ﾑ�ﾐｵﾐｽﾑτひｽﾐｰ ﾑ�ﾑび�ﾐｰﾐｽﾐｸﾑ�ﾐｰ';
 $labels['unread'] = 'ﾐ斷ｵﾐｿﾑ�ﾐｾﾑ�ﾐｸﾑひｰﾐｽﾐｵ';
 $labels['flagged'] = 'ﾐ榧ｷﾐｽﾐｰﾑ�ﾐｵﾐｽﾐｾ';
 $labels['unanswered'] = 'ﾐ斷ｵﾐｾﾐｴﾐｳﾐｾﾐｲﾐｾﾑ�ﾐｵﾐｽﾐｾ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾐ榧ｱﾑ�ﾐｸﾑ�ﾐｰﾐｽﾐｾ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'ﾐ｣ﾐｲﾐｵﾐｴﾐｸ';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'ﾐ樮ひｲﾐｾﾑ�ﾐｸ ﾑ� ﾐｽﾐｾﾐｲﾐｾﾐｼ ﾐｿﾑ�ﾐｾﾐｷﾐｾﾑ�ﾑ�';
 $labels['emlsave'] = 'ﾐ頒ｾﾐｲﾐｽﾐｻﾐｾﾐｰﾐｴ (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'ﾐ慴ｾﾐｴﾐｸﾑ�ﾐｸﾐｺﾑτ� ﾐｺﾐｰﾐｾ ﾐｽﾐｾﾐｲﾐｾ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾐ｡ﾐｰﾑ�ﾑひｰﾐｲﾐｸ HTML ﾐｿﾐｾﾑ�ﾑσｺﾐｵ';
 $labels['htmlonreply'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｿﾑ�ﾐｸ ﾐｾﾐｴﾐｳﾐｾﾐｲﾐｾﾑ�ﾑ� ﾐｽﾐｰ HTML ﾐｿﾐｾﾑ�ﾑσｺﾑ�';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ﾐｿﾐｾﾑひｿﾐｸﾑ�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾐ湲�ﾐｸﾐｺﾐｰﾐｶﾐｸ ﾐｿﾐｰﾐｽﾐｵﾐｻ ﾐｷﾐｰ ﾐｿﾑ�ﾐｵﾐｳﾐｻﾐｵﾐｴ';
 $labels['skin'] = 'ﾐ侑ｽﾑひｵﾑ�ﾑ�ﾐｵﾑ佯�';
 $labels['logoutclear'] = 'ﾐ侑ｷﾐｱﾑ�ﾐｸﾑ威ｸ ﾑ�ﾐｼﾐｵﾑ嶢ｵ ﾐｿﾑ�ﾐｸ ﾐｻﾐｾﾐｳﾐｾﾐｲﾐｰﾑ墫�';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾐ湲�ﾐｸ ﾐｾﾐｴﾐｳﾐｾﾐｲﾐｾﾑ�ﾑ� ﾐｾﾐｴﾑ�ﾑび�ﾐｰﾐｽﾐｸ ﾐｾﾑ�
 $labels['autoaddsignature'] = 'ﾐ績τひｾﾐｼﾐｰﾑび�ﾐｺﾐｸ ﾐｴﾐｾﾐｴﾐｰﾑ� ﾐｿﾐｾﾑひｿﾐｸﾑ�';
 $labels['newmessageonly'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｽﾐｾﾐｲﾐｵ ﾐｿﾐｾﾑ�ﾑσｺﾐｵ';
 $labels['replyandforwardonly'] = 'ﾑ�ﾐｰﾐｼﾐｾ ﾐｾﾐｴﾐｳﾐｾﾐｲﾐｾﾑ�ﾐｸ ﾐｸ ﾐｿﾑ�ﾐｾﾑ�ﾐｻﾐｵﾑ漬ｸﾐｲﾐｰﾑ墟ｰ';
-$labels['replysignaturepos'] = 'ﾐ湲�ﾐｸ ﾐｾﾐｴﾐｳﾐｾﾐｲﾐｾﾑ�ﾑ� ﾐｸﾐｻﾐｸ ﾐｿﾑ�ﾐｾﾑ�ﾐｻﾐｵﾑ漬ｸﾐｲﾐｰﾑ墫� ﾐｴﾐｾﾐｴﾐｰﾑ� ﾐｿﾐｾﾑひｿﾐｸﾑ�';
-$labels['belowquote'] = 'ﾐｸﾑ�ﾐｿﾐｾﾐｴ ﾐｺﾐｲﾐｾﾑひｵ';
-$labels['abovequote'] = 'ﾐｸﾐｷﾐｽﾐｰﾐｴ ﾐｺﾐｲﾐｾﾑひｵ';
 $labels['insertsignature'] = 'ﾐ｣ﾐｱﾐｰﾑ�ﾐｸ ﾐｿﾐｾﾑひｿﾐｸﾑ�';
 $labels['previewpanemarkread']  = 'ﾐ湲�ﾐｵﾐｳﾐｻﾐｵﾐｴﾐｰﾐｽﾑ� ﾐｿﾐｾﾑ�ﾑσｺﾑ� ﾐｾﾐｷﾐｽﾐｰﾑ�ﾐｸ ﾐｺﾐｰﾐｾ ﾐｿﾑ�ﾐｾﾑ�ﾐｸﾑひｰﾐｽﾑ�';
 $labels['afternseconds']  = 'ﾐｽﾐｰﾐｺﾐｾﾐｽ $n ﾑ�ﾐｵﾐｺﾑσｽﾐｴﾐｸ';
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 7ffbbd34a..32007e6f2 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾐ酉�ﾐｵﾑ威ｺﾐｰ ﾑ� ﾐｱﾐｰﾐｷﾐｸ ﾐｿﾐｾﾐｴﾐｰﾑひｰﾐｺﾐｰ!';
 $messages['requesttimedout'] = 'ﾐ厘ｰﾑ�ﾑひｵﾐｲ ﾑ侑ｵ ﾐｸﾑ�ﾑひｵﾐｺﾐｰﾐｾ';
 $messages['errorreadonly'] = 'ﾐ斷ｵ ﾐｼﾐｾﾐｶﾐｵ ﾐｴﾐｰ ﾐｸﾐｷﾐｲﾑ�ﾑ威ｸ ﾐｾﾐｿﾐｵﾑ�ﾐｰﾑ�ﾐｸﾑ佯�. ﾐ､ﾐｰﾑ�ﾑ�ﾐｸﾐｺﾐｻﾐｰ ﾑ�ﾐｵ ﾐｼﾐｾﾐｶﾐｵ ﾑ�ﾐｰﾐｼﾐｾ ﾑ�ﾐｸﾑひｰﾑひｸ.';
 $messages['errornoperm'] = 'ﾐ侑ｷﾐｲﾑ�ﾑ威ｵﾑ墟ｵ ﾐｾﾐｿﾐｵﾑ�ﾐｰﾑ�ﾐｸﾑ侑ｵ ﾐｽﾐｸﾑ侑ｵ ﾐｼﾐｾﾐｳﾑτ嶢ｵ. ﾐ榧ｴﾐｱﾐｸﾑ侑ｵﾐｽ ﾐｷﾐｰﾑ�ﾑひｵﾐｲ ﾐｷﾐｰ ﾐｴﾐｾﾐｷﾐｲﾐｾﾐｻﾑ�.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'ﾐ渙ｾﾐｳﾑ�ﾐｵﾑ威ｰﾐｽ ﾐｷﾐｰﾑ�ﾑひｵﾐｲ! ﾐ渙ｾﾐｴﾐｰﾑ�ﾐｸ ﾐｽﾐｸﾑ�ﾑ� ﾑ�ﾐｰﾑ�ﾑσｲﾐｰﾐｽﾐｸ.';
 $messages['invalidhost'] = 'ﾐ渙ｾﾐｳﾑ�ﾐｵﾑ威ｽﾐｾ ﾐｸﾐｼﾐｵ ﾑ�ﾐｵﾑ�ﾐｲﾐｵﾑ�ﾐｰ.';
 $messages['nomessagesfound'] = 'ﾐ斷ｵﾐｼﾐｰﾑひｵ ﾐｿﾐｾﾑ�ﾑσｺﾐｰ ﾑ� ﾑ�ﾐｰﾐｽﾐｴﾑτ�ﾐｵﾑび�.';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 5d10334b3..f61433527 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiera';
 $labels['move']     = 'Flytta';
 $labels['moveto']   = 'Flytta till:';
 $labels['download'] = 'Ladda ner';
+$labels['open']     = 'ﾃ朴pna';
 $labels['showattachment'] = 'Visa';
 $labels['showanyway'] = 'Visa det ﾃ､ndﾃ･';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Sida';
 $labels['unread'] = 'Olﾃ､sta';
 $labels['flagged'] = 'Flaggade';
 $labels['unanswered'] = 'Obesvarade';
+$labels['withattachment'] = 'Med bilaga';
 $labels['deleted'] = 'Borttagna';
 $labels['undeleted'] = 'Inte borttaget';
 $labels['invert'] = 'Invertera';
@@ -204,6 +206,8 @@ $labels['body']  = 'Innehﾃ･ll';
 
 $labels['openinextwin'] = 'ﾃ朴pna i nytt fﾃｶnster';
 $labels['emlsave'] = 'Spara (.eml)';
+$labels['changeformattext'] = 'Visa i text-format';
+$labels['changeformathtml'] = 'Visa i HTML-format';
 
 // message compose
 $labels['editasnew']      = 'Redigera som nytt';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Skriv meddelanden i HTML-format';
 $labels['htmlonreply'] = 'Endast vid svar pﾃ･ meddelande i HTML-format';
 $labels['htmlonreplyandforward'] = 'Vid svar pﾃ･ eller vidarebefordran av meddelande i HTML-format';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Visa namn och adress';
 $labels['previewpane'] = 'Visa meddelandefﾃ､ltet';
 $labels['skin'] = 'Stilmall fﾃｶr anvﾃ､ndargrﾃ､nssnitt';
 $labels['logoutclear'] = 'Tﾃｶm papperskorgen vid utloggning';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Ta bort befintlig signatur frﾃ･n meddelandet
 $labels['autoaddsignature'] = 'Infoga signatur automatiskt';
 $labels['newmessageonly'] = 'Vid nytt meddelande';
 $labels['replyandforwardonly'] = 'Vid svar och vidarebefordran';
-$labels['replysignaturepos'] = 'Vid svar eller vidarebefordran infoga signatur';
-$labels['belowquote'] = 'Nedanfﾃｶr befintligt meddelande';
-$labels['abovequote'] = 'Ovanfﾃｶr befintligt meddelande';
 $labels['insertsignature'] = 'Infoga signatur';
 $labels['previewpanemarkread']  = 'Mﾃ､rk meddelande som lﾃ､st vid visning';
 $labels['afternseconds']  = 'Efter $n sekunder';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 65ee6827d..63dddc548 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databasfel!';
 $messages['requesttimedout'] = 'Begﾃ､ran tog fﾃｶr lﾃ･ng tid';
 $messages['errorreadonly'] = 'ﾃ�tgﾃ､rden kunde inte utfﾃｶras. Katalogen ﾃ､r skrivskyddad';
 $messages['errornoperm'] = 'ﾃ�tgﾃ､rden kunde inte utfﾃｶras. Otillrﾃ､cklig befogenhet';
+$messages['erroroverquota'] = 'ﾃ�tgﾃ､rden kunde inte utfﾃｶras. Otillrﾃ､ckligt lagringsutrymme.';
+$messages['erroroverquotadelete'] = 'Otillrﾃ､ckligt lagringsutrymme. Tryck pﾃ･ SHIFT och DEL fﾃｶr att ta bort ett meddelande.';
 $messages['invalidrequest'] = 'Ogiltig begﾃ､ran! Informationen sparades inte.';
 $messages['invalidhost'] = 'Ogiltigt servernamn.';
 $messages['nomessagesfound'] = 'Inga meddelanden';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index d71da6799..bc1db7d00 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '牋ｨ牋歩ｮｲ牘�';
 $labels['move']     = 'Move';
 $labels['moveto']   = '牋�牋､牋ｱ牘財ｮ歩ｯ� 牋�牋ｩ牘≒ｮｪ牘財ｮｪ牘�...';
 $labels['download'] = '牋ｪ牋､牋ｿ牋ｵ牋ｿ牋ｱ牋歩ｯ財ｮ歩ｯ�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = '牋ｪ牋游ｮｿ牋歩ｯ財ｮ歩ｮｾ牋､牋､牘�';
 $labels['flagged'] = '牋ｨ牋游ｯ財ｮ壟ｮ､牘財ｮ､牋ｿ牋ｰ牋ｮ牋ｿ牋游ｯ財ｮ游ｮ､牘�';
 $labels['unanswered'] = '牋ｪ牋､牋ｿ牋ｲ牋ｳ牋ｿ牋歩ｯ財ｮ歩ｮｾ牋､牋､牘�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '牋ｨ牘�牋歩ｯ財ｮ歩ｮｿ牋ｯ牋､牘�';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = '牋､牋ｲ牘謂ｮ歩ｯ�牋ｴ牘�';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = '牋ｪ牘≒ｮ､牘� 牋壟ｮｾ牋ｳ牋ｰ牋､牘財ｮ､牋ｿ牋ｲ牘� 牋､牋ｿ牋ｱ';
 $labels['emlsave'] = '牋ｪ牋､牋ｿ牋ｵ牋ｿ牋ｱ牋歩ｯ財ｮ歩ｯ� (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '牋ｪ牘≒ｮ､牋ｿ牋ｯ牋､牋ｾ牋� 牋､牋ｿ牋ｰ牘≒ｮ､牘財ｮ､牘�';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML 牋壟ｯ�牋ｯ牘財ｮ､牋ｿ牋歩ｮｳ牘� 牋錫ｮｴ牘≒ｮ､牘�';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML 牋歩ｯ謂ｮｯ牘�牋ｾ牋ｪ牘財ｮｪ牋ｮ牘�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '牋ｮ牘≒ｮｨ牘財ｮ､牋ｿ牋ｯ 牋ｪ牋ｾ牋､牘財ｮ､牋ｿ牋ｯ牘� 牋歩ｮｾ牋游ｯ財ｮ游ｯ�';
 $labels['skin'] = '牋ｮ牘≒ｮ歩ｮｪ牘財ｮｪ牘� 牋､牘金ｮｱ牘財ｮｱ牋ｮ牘�';
 $labels['logoutclear'] = '牋ｵ牘�牋ｳ牋ｿ牋ｯ牘�牋ｱ牘≒ｮｮ牘� 牋ｪ牘�牋ｾ牋､牘� 牋歩ｯ≒ｮｪ牘財ｮｪ牘謂ｮｯ牘� 牋歩ｮｾ牋ｲ牋ｿ 牋壟ｯ�牋ｯ牘�';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '牋ｪ牋､牋ｿ牋ｲ牋ｳ牋ｿ牋歩ｯ財ｮ歩ｯ≒ｮｮ牘� 牋ｪ牘�牋
 $labels['autoaddsignature'] = '牋､牋ｾ牋ｩ牋ｾ牋� 牋歩ｯ謂ｮｯ牘�牋ｾ牋ｪ牘財ｮｪ牋､牘財ｮ､牘� 牋壟ｯ�牋ｰ牘�';
 $labels['newmessageonly'] = '牋ｪ牘≒ｮ､牘� 牋壟ｯ�牋ｯ牘財ｮ､牋ｿ 牋ｮ牋游ｯ財ｮ游ｯ≒ｮｮ牘�';
 $labels['replyandforwardonly'] = '牋ｪ牋､牋ｿ牋ｲ牋ｳ牋ｿ牋ｪ牘財ｮｪ牘� 牋ｮ牘≒ｮｩ牘財ｮ�牋ｩ牘≒ｮｪ牘財ｮｪ牘� 牋ｮ牋游ｯ財ｮ游ｯ≒ｮｮ牘�';
-$labels['replysignaturepos'] = '牋ｪ牋､牋ｿ牋ｲ牋ｳ牋ｿ牋歩ｯ財ｮ歩ｯ≒ｮｮ牘� 牋ｪ牘�牋ｾ牋､牘≒ｮｮ牘� 牋ｮ牘≒ｮｩ牘財ｮ�牋ｩ牘≒ｮｪ牘財ｮｪ牘≒ｮｮ牘� 牋ｪ牘�牋ｾ牋､牘≒ｮｮ牘� 牋歩ｯ謂ｮｯ牘�牋ｾ牋ｪ牘財ｮｪ牋ｮ牋ｿ牋游ｯ�';
-$labels['belowquote'] = '牋ｮ牘�牋ｱ牘財ｮ歩ｯ金ｮｳ牘≒ｮ歩ｯ財ｮ歩ｯ� 牋歩ｯ�牋ｴ牘�';
-$labels['abovequote'] = '牋ｮ牘�牋ｱ牘財ｮ歩ｯ金ｮｳ牘≒ｮ歩ｯ財ｮ歩ｯ� 牋ｮ牘�牋ｲ牘�';
 $labels['insertsignature'] = '牋歩ｯ謂ｮｯ牘�牋ｾ牋ｪ牘財ｮｪ牋ｮ牋ｿ牋游ｯ�';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index c06765435..65e611f88 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = '牋壟ｯ�牋ｲ牘財ｮｲ牋ｾ牋､ 牋ｵ牘�牋｣牘財ｮ游ｯ≒ｮ歩ｯ金ｮｳ牘�! 牋錫ｮｨ牘財ｮ､ 牋､牋ｰ牋ｵ牘≒ｮｮ牘� 牋壟ｯ�牋ｮ牋ｿ牋歩ｯ財ｮ歩ｮｪ牘財ｮｪ牋游ｮｵ牋ｿ牋ｲ牘財ｮｲ牘�.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '牋�牋ｨ牘財ｮ､ 牋､牋ｪ牋ｾ牋ｲ牘� 牋ｪ牘�牋游ｯ財ｮ游ｮｿ牋ｯ牋ｿ牋ｲ牘� 牋錫ｮｨ牘財ｮ､ 牋､牋ｰ牋ｵ牘≒ｮｮ牘� 牋壟ｯ�牋ｮ牋ｿ牋歩ｯ財ｮ歩ｮｪ牘財ｮｪ牋游ｮｵ牋ｿ牋ｲ牘財ｮｲ牘�';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index f96bafa66..03b4161fb 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '犧�犧ｱ犧扉ｸ･犧ｭ犧�';
 $labels['move']     = '犹�犧･犧ｷ犹謂ｸｭ犧�';
 $labels['moveto']   = '犧｢犹霞ｸｲ犧｢犹�犧�...';
 $labels['download'] = '犧扉ｸｲ犧ｧ犧吭ｹ呉ｹもｸｫ犧･犧�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = '犹≒ｸｪ犧扉ｸ�';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '犧ｫ犧吭ｹ霞ｸｲ犧巵ｸｱ犧謂ｸ謂ｸｸ犧壟ｸｱ犧�';
 $labels['unread'] = '犧謂ｸ扉ｸｫ犧｡犧ｲ犧｢犧伶ｸｵ犹謂ｹ�犧｡犹謂ｹ�犧扉ｹ霞ｸｭ犹謂ｸｲ犧�';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = '犧｢犧ｱ犧�犹�犧｡犹謂ｹ�犧扉ｹ霞ｸ歩ｸｭ犧�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '犧･犧壟ｹ≒ｸ･犹霞ｸｧ';
 $labels['undeleted'] = '犧｢犧ｱ犧�犹�犧｡犹謂ｹ�犧扉ｹ霞ｸ･犧�';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = '犹�犧吭ｸｷ犹霞ｸｭ犧ｫ犧ｲ';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '犹�犧もｸｵ犧｢犧吭ｸ謂ｸ扉ｸｫ犧｡犧ｲ犧｢犹≒ｸ壟ｸ� HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '犧･犧ｲ犧｢犧｡犧ｷ犧ｭ犧癌ｸｷ犹謂ｸｭ犹≒ｸ壟ｸ� HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '犹≒ｸｪ犧扉ｸ�犧ｫ犧吭ｹ霞ｸｲ犧歩ｹ謂ｸｲ犧�犧歩ｸｱ犧ｧ犧ｭ犧｢犹謂ｸｲ犧�犹≒ｸｪ犧扉ｸ�犧憫ｸ･';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = '犹�犧樅ｸｴ犹謂ｸ｡犧･犧ｲ犧｢犹�犧金ｹ�犧吭ｸ歩ｹ呉ｹ�犧もｹ霞ｸｲ犹�犧巵ｸｭ犧ｱ犧歩ｹもｸ吭ｸ｡犧ｱ犧歩ｸｴ';
 $labels['newmessageonly'] = '犹�犧霞ｸ樅ｸｲ犧ｰ犧もｹ霞ｸｭ犧�犧ｧ犧ｲ犧｡犹�犧ｫ犧｡犹謂ｹ�犧伶ｹ謂ｸｲ犧吭ｸｱ犹霞ｸ�';
 $labels['replyandforwardonly'] = '犧歩ｸｭ犧壟ｸ≒ｸ･犧ｱ犧壟ｹ≒ｸ･犧ｰ犧ｪ犹謂ｸ�犧歩ｹ謂ｸｭ犹�犧伶ｹ謂ｸｲ犧吭ｸｱ犹霞ｸ�';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = '犹≒ｸ伶ｸ｣犧≒ｸ･犧ｲ犧｢犹�犧金ｹ�犧吭ｸ歩ｹ�';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 1b78b7d60..826930c0e 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '犹�犧≒ｸｴ犧扉ｸもｹ霞ｸｭ犧憫ｸｴ犧扉ｸ樅ｸ･犧ｲ犧扉ｹ�犧≒ｸｵ犹謂ｸ
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = '犧癌ｸｷ犹謂ｸｭ犹�犧金ｸｴ犧｣犹呉ｸ游ｹ�犧ｧ犧ｭ犧｣犹呉ｹ�犧｡犹謂ｸ籾ｸｹ犧≒ｸ歩ｹ霞ｸｭ犧�';
 $messages['nomessagesfound'] = '犹�犧｡犹謂ｸ｡犧ｵ犧謂ｸ扉ｸｫ犧｡犧ｲ犧｢犹�犧吭ｸ≒ｸ･犹謂ｸｭ犧�犧謂ｸ扉ｸｫ犧｡犧ｲ犧｢犧吭ｸｵ犹�';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 6937f2a1e..9e78ea3fa 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopyala';
 $labels['move']     = 'Taﾅ淨ｱ';
 $labels['moveto']   = 'ﾅ柆raya taﾅ淨ｱ...';
 $labels['download'] = 'ﾄｰndir';
+$labels['open']     = 'Aﾃｧ';
 $labels['showattachment'] = 'Gﾃｶster';
 $labels['showanyway'] = 'Yine de gﾃｶster';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾅ枴mdiki sayfa';
 $labels['unread'] = 'Okunmamﾄｱﾅ殕arﾄｱ';
 $labels['flagged'] = 'ﾄｰﾅ歛retlenmiﾅ殕eri';
 $labels['unanswered'] = 'Yanﾄｱtlanmamﾄｱﾅ殕arﾄｱ';
+$labels['withattachment'] = 'Eklenti ile';
 $labels['deleted'] = 'Silinmiﾅ殕eri';
 $labels['undeleted'] = 'Silinmemiﾅ�';
 $labels['invert'] = 'Seﾃｧimi Tersine ﾃ�evir';
@@ -204,6 +206,8 @@ $labels['body']  = 'Gﾃｶvde';
 
 $labels['openinextwin'] = 'Yeni pencerede aﾃｧ';
 $labels['emlsave'] = 'ﾄｰndir (.eml)';
+$labels['changeformattext'] = 'Dﾃｼz yazﾄｱ formatﾄｱnda gﾃｶster';
+$labels['changeformathtml'] = 'HTML formatﾄｱnda gﾃｶster';
 
 // message compose
 $labels['editasnew']      = 'Postayﾄｱ yeni olarak dﾃｼzenle';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Seﾃｧili kiﾅ殃ye posta gﾃｶnder';
 $labels['contactsfromto'] = 'Kiﾅ殃ler: $from - $to , Toplam: $count';
 $labels['print']          = 'Yazdﾄｱr';
 $labels['export']         = 'Dﾄｱﾅ歛 aktar';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Hepsini dﾄｱﾅ歛 aktar';
+$labels['exportsel']      = 'Seﾃｧileni dﾄｱﾅ歛 aktar';
 $labels['exportvcards']   = 'vCard olarak dﾄｱﾅ歛 aktar';
 $labels['newcontactgroup'] = 'Yeni kiﾅ殃 grubu oluﾅ殳ur';
 $labels['grouprename']    = 'Grubu yeniden adlandﾄｱr';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML postalarﾄｱ oluﾅ殳ur';
 $labels['htmlonreply'] = 'sadece HTML postalarﾄｱ yanﾄｱtlarken';
 $labels['htmlonreplyandforward'] = 'HTML biﾃｧimindeki posta yanﾄｱtlandﾄｱﾄ淨ｱnda veye iletildiﾄ殃nde';
 $labels['htmlsignature'] = 'HTML imza';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾃ墨izleme panelini gﾃｶster';
 $labels['skin'] = 'Arayﾃｼz gﾃｶrﾃｼnﾃｼmﾃｼ';
 $labels['logoutclear'] = 'Oturumu kapatﾄｱnca ﾃ�ﾃｶpﾃｼ temizle';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Yanﾄｱtlarken ﾃｶnceki imzalarﾄｱ sil';
 $labels['autoaddsignature'] = 'Otomatik olarak imza ekle';
 $labels['newmessageonly'] = 'sadece yeni postalarda';
 $labels['replyandforwardonly'] = 'sadece yanﾄｱtlar ve yﾃｶnlendirmelerde';
-$labels['replysignaturepos'] = 'Yanﾄｱtlarken veya yﾃｶnlendirirken imzayﾄｱ yerleﾅ殳ir';
-$labels['belowquote'] = 'alﾄｱntﾄｱnﾄｱn altﾄｱna';
-$labels['abovequote'] = 'alﾄｱntﾄｱnﾄｱn ﾃｼstﾃｼne';
 $labels['insertsignature'] = 'ﾄｰmza ekle';
 $labels['previewpanemarkread']  = 'ﾃ墨zilemede gﾃｶrﾃｼnen postalarﾄｱ okunmuﾅ� iﾅ歛retle';
 $labels['afternseconds']  = '$n saniye sonra';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index f3c0919c0..3b451d556 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Veritabanﾄｱ Hatasﾄｱ!';
 $messages['requesttimedout'] = 'ﾄｰstek zaman aﾅ淨ｱmﾄｱna uﾄ殲adﾄｱ';
 $messages['errorreadonly'] = 'ﾄｰﾅ殕em gerﾃｧekleﾅ殳irilemedi. Dizin salt okunabilir';
 $messages['errornoperm'] = 'ﾄｰﾅ殕em gerﾃｧekleﾅ殳irilemedi. ﾄｰzin verilmedi.';
+$messages['erroroverquota'] = 'ﾄｰﾅ殕em gerﾃｧekleﾅ殳irilemedi. Boﾅ� alan yok.';
+$messages['erroroverquotadelete'] = 'Boﾅ� alan yok. SHIFT+DEL tuﾅ� kombinasyonunu kullanarak mesajﾄｱ silin.';
 $messages['invalidrequest'] = 'Geﾃｧersiz ﾄｰstek! Veri kaydedilmedi';
 $messages['invalidhost'] = 'Geﾃｧersiz sunucu adﾄｱ.';
 $messages['nomessagesfound'] = 'Posta kutusunda ileti bulunamadﾄｱ';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index d70718fcc..4605bb98d 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ﾐ墟ｾﾐｿﾑ毛社ｲﾐｰﾑひｸ';
 $labels['move']     = 'ﾐ渙ｵﾑ�ﾐｵﾐｼﾑ毛�ﾑひｸﾑひｸ';
 $labels['moveto']   = 'ﾐ渙ｵﾑ�ﾐｵﾐｼﾑ毛�ﾑひｸﾑひｸ ﾐｴﾐｾ...';
 $labels['download'] = 'ﾐ厘ｰﾐｲﾐｰﾐｽﾑひｰﾐｶﾐｸﾑひｸ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｰﾑひｸ';
 $labels['showanyway'] = 'ﾐ柘�ﾐｵ ﾐｾﾐｴﾐｽﾐｾ ﾐｿﾐｾﾐｺﾐｰﾐｷﾐｰﾑひｸ';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ﾐ渙ｾﾑひｾﾑ�ﾐｽﾐｰ ﾑ�ﾑひｾﾑ�ﾑ孟ｽﾐｺﾐｰ';
 $labels['unread'] = 'ﾐ斷ｵﾐｿﾑ�ﾐｾﾑ�ﾐｸﾑひｰﾐｽﾑ�';
 $labels['flagged'] = 'ﾐ�ﾐｷ ﾐｷﾑ毛�ﾐｾﾑ�ﾐｺﾐｾﾑ�';
 $labels['unanswered'] = 'ﾐ岱ｵﾐｷ ﾐｲﾑ孟ｴﾐｿﾐｾﾐｲﾑ孟ｴﾑ�';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾐ漬ｸﾐｴﾐｰﾐｻﾐｵﾐｽﾑ�';
 $labels['undeleted'] = 'ﾐ斷ｵ ﾐｲﾐｸﾐｴﾐｰﾐｻﾐｵﾐｽﾐｾ';
 $labels['invert'] = 'ﾐ�ﾐｽﾐｲﾐｵﾑ�ﾑびσｲﾐｰﾑひｸ ﾐｲﾐｸﾐｴﾑ孟ｻﾐｵﾐｽﾐｽﾑ�';
@@ -204,6 +206,8 @@ $labels['body']  = 'ﾐ｢ﾑ孟ｻﾐｾ ﾐｿﾐｾﾐｲﾑ孟ｴﾐｾﾐｼﾐｻﾐｵﾐｽﾐｽﾑ�';
 
 $labels['openinextwin'] = 'ﾐ柘孟ｴﾐｺﾑ�ﾐｸﾑひｸ ﾐｲ ﾐｽﾐｾﾐｲﾐｾﾐｼﾑ� ﾐｲﾑ孟ｺﾐｽﾑ�';
 $labels['emlsave'] = 'ﾐ厘ｱﾐｵﾑ�ﾐｵﾐｳﾑひｸ (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'ﾐ�ﾐｵﾐｴﾐｰﾐｳﾑσｲﾐｰﾑひｸ ﾑ紹ｺ ﾐｽﾐｾﾐｲﾐｸﾐｹ';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ﾐ｡ﾑひｲﾐｾﾑ�ﾑ社ｲﾐｰﾑひｸ ﾐｻﾐｸﾑ�ﾑひｸ ﾐｲ HTML';
 $labels['htmlonreply'] = 'ﾑび孟ｻﾑ糊ｺﾐｸ ﾑ� ﾐｲﾑ孟ｴﾐｿﾐｾﾐｲﾑ孟ｴﾑ� ﾐｽﾐｰ HTML ﾐｿﾐｾﾐｲﾑ孟ｴﾐｾﾐｼﾐｻﾐｵﾐｽﾐｽﾑ�';
 $labels['htmlonreplyandforward'] = 'ﾐｿﾑ孟ｴ ﾑ�ﾐｰﾑ� ﾐｿﾐｵﾑ�ﾐｵﾑ�ﾐｸﾐｻﾐｰﾐｽﾐｽﾑ� ﾐｰﾐｱﾐｾ ﾐｲﾑ孟ｴﾐｿﾐｾﾐｲﾑ孟ｴﾑ� ﾐｽﾐｰ ﾐｿﾐｾﾐｲﾑ孟ｴﾐｾﾐｼﾐｻﾐｵﾐｽﾐｽﾑ� HTML';
 $labels['htmlsignature'] = 'ﾐ湲孟ｴﾐｿﾐｸﾑ� ﾐｲ HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ﾐ渙ｾﾐｺﾐｰﾐｷﾐｰﾑひｸ ﾐｿﾐｰﾐｽﾐｵﾐｻﾑ� ﾐｿﾐｵﾑ�ﾐｵﾐｳﾐｻﾑ紹ｴﾑ�';
 $labels['skin'] = 'ﾐ｢ﾐｵﾐｼﾐｰ';
 $labels['logoutclear'] = 'ﾐ樮�ﾐｸﾑ禍ｰﾑひｸ ﾐｺﾐｾﾑ威ｸﾐｺ ﾐｿﾑ�ﾐｸ ﾐｲﾐｸﾑ�ﾐｾﾐｴﾑ�';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ﾐ湲�ﾐｸ ﾐｲﾑ孟ｴﾐｿﾐｾﾐｲﾑ孟ｴﾑ� ﾐｲﾐｸﾐｴﾐｰﾐｻﾑ肖ひｸ ﾐｿ
 $labels['autoaddsignature'] = 'ﾐ籍ｲﾑひｾﾐｼﾐｰﾑひｸﾑ�ﾐｽﾐｾ ﾐｴﾐｾﾐｴﾐｰﾐｲﾐｰﾑひｸ ﾐｿﾑ孟ｴﾐｿﾐｸﾑ�';
 $labels['newmessageonly'] = 'ﾑび孟ｻﾑ糊ｺﾐｸ ﾐｴﾐｾ ﾐｽﾐｾﾐｲﾐｸﾑ� ﾐｻﾐｸﾑ�ﾑび孟ｲ';
 $labels['replyandforwardonly'] = 'ﾑび孟ｻﾑ糊ｺﾐｸ ﾐｿﾑ�ﾐｸ ﾐｲﾑ孟ｴﾐｿﾐｾﾐｲﾑ孟ｴﾑ肖� ﾑひｰ ﾐｿﾐｵﾑ�ﾐｵﾑ�ﾐｸﾐｻﾐｺﾐｰﾑ�';
-$labels['replysignaturepos'] = 'ﾐ湲�ﾐｸ ﾐｲﾑ孟ｴﾐｿﾐｾﾐｲﾑ孟ｴﾑ肖� ﾑ�ﾐｸ ﾐｿﾐｵﾑ�ﾐｵﾑ�ﾐｸﾐｻﾐｺﾐｰﾑ� ﾐｴﾐｾﾐｴﾐｰﾐｲﾐｰﾑひｸ ﾐｿﾑ孟ｴﾐｿﾐｸﾑ�';
-$labels['belowquote'] = 'ﾐｿﾑ毛�ﾐｻﾑ� ﾑ�ﾐｸﾑひｰﾑひｸ';
-$labels['abovequote'] = 'ﾐｿﾐｵﾑ�ﾐｵﾐｴ ﾑ�ﾐｸﾑひｰﾑひｾﾑ�';
 $labels['insertsignature'] = 'ﾐ頒ｾﾐｴﾐｰﾑひｸ ﾐｿﾑ孟ｴﾐｿﾐｸﾑ�';
 $labels['previewpanemarkread']  = 'ﾐ渙ｾﾐｷﾐｽﾐｰﾑ�ﾐｸﾑひｸ ﾐｿﾐｵﾑ�ﾐｵﾐｳﾐｻﾑ紹ｽﾑτび� ﾐｻﾐｸﾑ�ﾑひｸ ﾑ紹ｺ ﾐｿﾑ�ﾐｾﾑ�ﾐｸﾑひｰﾐｽﾑ�';
 $labels['afternseconds']  = 'ﾑ�ﾐｵﾑ�ﾐｵﾐｷ $n ﾑ�ﾐｵﾐｺﾑσｽﾐｴ';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 522f1f4fc..521492d99 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'ﾐ渙ｾﾐｼﾐｸﾐｻﾐｺﾐｰ ﾐｱﾐｰﾐｷﾐｸ ﾐｴﾐｰﾐｽﾐｸﾑ�!';
 $messages['requesttimedout'] = 'ﾐ｢ﾐｰﾐｹﾐｼ-ﾐｰﾑτ� ﾐｷﾐｰﾐｿﾐｸﾑび�';
 $messages['errorreadonly'] = 'ﾐ斷ｵﾐｼﾐｾﾐｶﾐｻﾐｸﾐｲﾐｾ ﾐｲﾐｸﾐｺﾐｾﾐｽﾐｰﾑひｸ ﾐｾﾐｿﾐｵﾑ�ﾐｰﾑ�ﾑ毛�. ﾐ渙ｰﾐｿﾐｺﾐｰ ﾐｴﾐｾﾑ�ﾑびσｿﾐｽﾐｰ ﾑび孟ｻﾑ糊ｺﾐｸ ﾐｴﾐｻﾑ� ﾑ�ﾐｸﾑひｰﾐｽﾐｽﾑ�.';
 $messages['errornoperm'] = 'ﾐ斷ｵﾐｼﾐｾﾐｶﾐｻﾐｸﾐｲﾐｾ ﾐｲﾐｸﾐｺﾐｾﾐｽﾐｰﾑひｸ ﾐｾﾐｿﾐｵﾑ�ﾐｰﾑ�ﾑ毛�. ﾐ頒ｾﾑ�ﾑびσｿ ﾐｷﾐｰﾐｱﾐｾﾑ�ﾐｾﾐｽﾐｵﾐｽﾐｾ';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'ﾐ斷ｵﾐｲﾑ毛�ﾐｽﾐｸﾐｹ ﾐｷﾐｰﾐｿﾐｸﾑ�! ﾐ頒ｰﾐｽﾑ� ﾐｽﾐｵ ﾐｷﾐｱﾐｵﾑ�ﾐｵﾐｶﾐｵﾐｽﾐｾ.';
 $messages['invalidhost'] = 'ﾐ斷ｵﾐｲﾑ毛�ﾐｽﾐｵ ﾑ孟ｼ\'ﾑ� ﾑ�ﾐｵﾑ�ﾐｲﾐｵﾑ�ﾑ�.';
 $messages['nomessagesfound'] = 'ﾐ嶢ｸﾑ�ﾑび孟ｲ ﾐｽﾐｵ ﾐｷﾐｽﾐｰﾐｹﾐｴﾐｵﾐｽﾐｾ';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index eb20b8cc5..f1cf95149 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Sao chﾃｩp';
 $labels['move']     = 'Di Chuy盻ハ';
 $labels['moveto']   = 'Di chuy盻ハ t盻嬖...';
 $labels['download'] = 'T蘯｣i v盻�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Hi盻ハ th盻�';
 $labels['showanyway'] = 'Ti蘯ｿp t盻･c hi盻ハ th盻�';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Trang hi盻�n t蘯｡i';
 $labels['unread'] = 'Chﾆｰa ﾄ黛ｻ皇';
 $labels['flagged'] = 'ﾄ静｣ ﾄ妥｡nh d蘯･u';
 $labels['unanswered'] = 'Chﾆｰa tr蘯｣ l盻拱';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ﾄ静｣ xﾃｳa';
 $labels['undeleted'] = 'Chﾆｰa xﾃｳa ﾄ柁ｰ盻｣c';
 $labels['invert'] = 'ﾄ雪ｺ｣o ngﾆｰ盻｣c';
@@ -204,6 +206,8 @@ $labels['body']  = 'N盻冓 dung thﾆｰ';
 
 $labels['openinextwin'] = 'M盻� trong khung c盻ｭa m盻嬖';
 $labels['emlsave'] = 'T蘯｣i v盻� theo ﾄ黛ｻ杵h d蘯｡ng .eml';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'S盻ｭa nhﾆｰ m盻冲 email m盻嬖';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'So蘯｡n thﾆｰ d蘯｡ng HTML';
 $labels['htmlonreply'] = 'Ch盻� tr蘯｣ l盻拱 l蘯｡i b蘯ｱng thﾆｰ HTML';
 $labels['htmlonreplyandforward'] = 'Khi chuy盻ハ ti蘯ｿp ho蘯ｷc tr蘯｣ l盻拱 thﾆｰ theo ﾄ黛ｻ杵h d蘯｡ng HTML';
 $labels['htmlsignature'] = 'Ch盻ｯ kﾃｽ HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Hi盻ハ th盻� ﾃｴ Xem th盻ｭ';
 $labels['skin'] = 'B盻� m蘯ｷt giao di盻�n';
 $labels['logoutclear'] = 'Xﾃｳa s蘯｡ch rﾃ｡c khi thoﾃ｡t';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Khi tr蘯｣ l盻拱 b盻� ch盻ｯ kﾃｽ cﾅｩ kh盻淑 n盻
 $labels['autoaddsignature'] = 'T盻ｱ ﾄ黛ｻ冢g thﾃｪm ch盻ｯ kﾃｽ';
 $labels['newmessageonly'] = 'ch盻� thﾆｰ m盻嬖';
 $labels['replyandforwardonly'] = 'ch盻� tr蘯｣ l盻拱 vﾃ� chuy盻ハ ti蘯ｿp thﾆｰ';
-$labels['replysignaturepos'] = 'Khi tr蘯｣ l盻拱 ho蘯ｷc chuy盻ハ ti蘯ｿp thﾆｰ thﾃｪm vﾃ�o ch盻ｯ kﾃｽ';
-$labels['belowquote'] = 'Dﾆｰ盻嬖 ph蘯ｧn n盻冓 dung cﾅｩ';
-$labels['abovequote'] = 'trﾃｪn ph蘯ｧn n盻冓 dung cﾅｩ';
 $labels['insertsignature'] = 'Chﾃｨn ch盻ｯ kﾃｽ';
 $labels['previewpanemarkread']  = 'ﾄ静｡nh d蘯ｫu thﾆｰ xem th盻ｭ lﾃ� ﾄ妥｣ ﾄ黛ｻ皇';
 $labels['afternseconds']  = 'sau $n giﾃ｢y';
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 1d5f5f84c..50bf71846 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'L盻擁 cﾆ｡ s盻� d盻ｯ li盻�u';
 $messages['requesttimedout'] = 'Yﾃｪu c蘯ｧu h蘯ｿt  h蘯｡n';
 $messages['errorreadonly'] = 'Khﾃｴng th盻� th盻ｱc hi盻�n thao tﾃ｡c. Thﾆｰ m盻･c ch盻� cho phﾃｩp ﾄ黛ｻ皇.';
 $messages['errornoperm'] = 'B蘯｡n khﾃｴng ﾄ黛ｻｧ quy盻］ h蘯｡n ﾄ黛ｻ� th盻ｱc hi盻�n thao tﾃ｡c nﾃ�y.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Yﾃｪu c蘯ｧu khﾃｴng h盻｣p l盻�! Khﾃｴng cﾃｳ d盻ｯ li盻�u nﾃ�o ﾄ柁ｰ盻｣c lﾆｰu.';
 $messages['invalidhost'] = 'Sai thﾃｴng tin mﾃ｡y ch盻ｧ';
 $messages['nomessagesfound'] = 'Khﾃｴng th蘯･y cﾃｳ thﾆｰ nﾃ�o trong h盻冪 thﾆｰ nﾃ�y.';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index af2bd7b68..23a42b96d 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -33,15 +33,15 @@ $labels['addressbook'] = '騾夊ｮｯ蠖�';
 
 // mailbox names
 $labels['inbox']  = '謾ｶ莉ｶ邂ｱ';
-$labels['drafts'] = '闕臥ｨｿ';
-$labels['sent']   = '蟾ｲ蜿鷹��';
+$labels['drafts'] = '闕臥ｨｿ邂ｱ';
+$labels['sent']   = '蟾ｲ蜿鷹��驍ｮ莉ｶ';
 $labels['trash']  = '蟾ｲ蛻�髯､驍ｮ莉ｶ';
 $labels['junk']   = '蝙�蝨ｾ驍ｮ莉ｶ';
 
 // message listing
 $labels['subject'] = '荳ｻ鬚�';
 $labels['from']    = '蜿台ｻｶ莠ｺ';
-$labels['sender']  = 'Sender';
+$labels['sender']  = '蜿台ｻｶ莠ｺ';
 $labels['to']      = '謾ｶ莉ｶ莠ｺ';
 $labels['cc']      = '謚�騾�';
 $labels['bcc']     = '蟇�騾�';
@@ -50,22 +50,23 @@ $labels['followupto'] = '謚暮�堤ｻ�';
 $labels['date']    = '譌･譛�';
 $labels['size']    = '螟ｧ蟆�';
 $labels['priority'] = '莨伜�育ｺｧ';
-$labels['organization'] = '蜈ｬ蜿ｸ';
+$labels['organization'] = '扈�扈�';
 $labels['readstatus'] = '髦�隸ｻ迥ｶ諤�';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = '蛻苓｡ｨ騾蛾｡ｹ';
 
-$labels['mailboxlist'] = '逶ｮ蠖慕ｮ｡逅�';
-$labels['messagesfromto'] = '隨ｬ $from 蛻ｰ $to�ｼ悟�ｱ $count 蟆�驍ｮ莉ｶ';
-$labels['threadsfromto'] = '隨ｬ $from 蛻ｰ $to�ｼ悟�ｱ $count 荳ｪ荳ｻ鬚�';
-$labels['messagenrof'] = '隨ｬ $nr 蟆�驍ｮ莉ｶ�ｼ悟�ｱ $count 蟆�';
+$labels['mailboxlist'] = '驍ｮ莉ｶ螟ｹ';
+$labels['messagesfromto'] = '隨ｬ $from 蛻ｰ $to�ｼ悟�ｱ隶｡ $count 蟆�驍ｮ莉ｶ';
+$labels['threadsfromto'] = '隨ｬ $from 蛻ｰ $to�ｼ悟�ｱ隶｡ $count 荳ｪ荳ｻ鬚�';
+$labels['messagenrof'] = '隨ｬ $nr 蟆�驍ｮ莉ｶ�ｼ悟�ｱ隶｡ $count 蟆�';
 $labels['fromtoshort'] = '閾ｪ $from 窶� $to 扈溯ｮ｡ $count';
 
 $labels['copy']     = '螟榊宛';
 $labels['move']     = '遘ｻ蜉ｨ';
-$labels['moveto']   = '遘ｻ蜉ｨ閾ｳ';
+$labels['moveto']   = '遘ｻ閾ｳ...';
 $labels['download'] = '荳玖ｽｽ';
+$labels['open']     = '謇灘ｼ�';
 $labels['showattachment'] = '譏ｾ遉ｺ';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = '諤ｻ譏ｯ譏ｾ遉ｺ';
 
 $labels['filename'] = '譁�莉ｶ蜷�';
 $labels['filesize'] = '譁�莉ｶ螟ｧ蟆�';
@@ -73,7 +74,7 @@ $labels['filesize'] = '譁�莉ｶ螟ｧ蟆�';
 $labels['addtoaddressbook'] = '豺ｻ蜉�閾ｳ騾夊ｮｯ蠖�';
 
 // weekdays short
-$labels['sun'] = '蜻ｨ譌･';
+$labels['sun'] = '譏滓悄譌･';
 $labels['mon'] = '譏滓悄荳�';
 $labels['tue'] = '譏滓悄莠�';
 $labels['wed'] = '譏滓悄荳�';
@@ -122,8 +123,8 @@ $labels['today'] = '莉雁､ｩ';
 
 // toolbar buttons
 $labels['refresh']          = '蛻ｷ譁ｰ';
-$labels['checkmail']        = '謾ｶ蜿匁眠驍ｮ莉ｶ';
-$labels['compose']          = '蜀咎ぐ莉ｶ';
+$labels['checkmail']        = '譽�譟･譁ｰ驍ｮ莉ｶ';
+$labels['compose']          = '謦ｰ蜀呎眠驍ｮ莉ｶ';
 $labels['writenewmessage']  = '蜀咎ぐ莉ｶ';
 $labels['reply']            = '蝗槫､�';
 $labels['replytomessage']   = '蝗槫､榊書莉ｶ莠ｺ';
@@ -135,42 +136,43 @@ $labels['forwardinline']    = '逶ｴ謗･霓ｬ蜿�';
 $labels['forwardattachment'] = '莉･髯�莉ｶ霓ｬ蜿�';
 $labels['forwardmessage']   = '霓ｬ蜿鷹ぐ莉ｶ';
 $labels['deletemessage']    = '蛻�髯､驍ｮ莉ｶ';
-$labels['movemessagetotrash'] = '遘ｻ蜉ｨ驍ｮ莉ｶ蛻ｰ蝗樊噺遶�';
+$labels['movemessagetotrash'] = '遘ｻ閾ｳ蟾ｲ蛻�髯､驍ｮ莉ｶ';
 $labels['printmessage']     = '謇灘魂驍ｮ莉ｶ';
 $labels['previousmessage']  = '譏ｾ遉ｺ荳贋ｸ�蟆�驍ｮ莉ｶ';
 $labels['firstmessage']     = '譏ｾ遉ｺ隨ｬ荳�蟆�驍ｮ莉ｶ';
 $labels['nextmessage']      = '荳倶ｸ�蟆�';
 $labels['lastmessage']      = '譛�蜷惹ｸ�蟆�';
 $labels['backtolist']       = '霑泌屓驍ｮ莉ｶ蛻苓｡ｨ';
-$labels['viewsource']       = '譏ｾ遉ｺ驍ｮ莉ｶ貅先枚莉ｶ';
+$labels['viewsource']       = '譏ｾ遉ｺ蜴溷ｧ矩ぐ莉ｶ譁�莉ｶ';
 $labels['mark']             = '譬�隶ｰ';
-$labels['markmessages']     = '譬�隶ｰ驍ｮ莉ｶ';
+$labels['markmessages']     = '譬�隶ｰ騾我ｸｭ逧�驍ｮ莉ｶ荳ｺ';
 $labels['markread']         = '蟾ｲ隸ｻ';
 $labels['markunread']       = '譛ｪ隸ｻ';
 $labels['markflagged']      = '蟾ｲ譬�隶ｰ';
 $labels['markunflagged']    = '譛ｪ譬�隶ｰ';
-$labels['moreactions']      = '譖ｴ螟壼勘菴�...';
+$labels['moreactions']      = '譖ｴ螟壽桃菴�...';
 $labels['more']             = '譖ｴ螟�';
-$labels['back']             = '蜷朱��';
+$labels['back']             = '霑泌屓';
 $labels['options']          = '騾蛾｡ｹ';
 
 $labels['select'] = '騾画叫';
 $labels['all'] = '蜈ｨ驛ｨ';
 $labels['none'] = '譌�';
 $labels['currpage'] = '蠖灘燕鬘ｵ';
-$labels['unread'] = '譛ｪ隸ｻ';
-$labels['flagged'] = '蟾ｲ譬�隶ｰ';
-$labels['unanswered'] = '譛ｪ蝗槫､�';
-$labels['deleted'] = '蛻�髯､';
-$labels['undeleted'] = 'Not deleted';
+$labels['unread'] = '譛ｪ隸ｻ驍ｮ莉ｶ';
+$labels['flagged'] = '蟾ｲ譬�隶ｰ驍ｮ莉ｶ';
+$labels['unanswered'] = '譛ｪ蝗槫､埼ぐ莉ｶ';
+$labels['withattachment'] = 'With attachment';
+$labels['deleted'] = '蟾ｲ蛻�髯､驍ｮ莉ｶ';
+$labels['undeleted'] = '譛ｪ蛻�髯､驍ｮ莉ｶ';
 $labels['invert'] = '蜿埼��';
 $labels['filter'] = '霑�貊､';
 $labels['list'] = '蛻苓｡ｨ';
 $labels['threads'] = '荳ｻ鬚�';
 $labels['expand-all'] = '螻募ｼ�蜈ｨ驛ｨ';
 $labels['expand-unread'] = '螻募ｼ�譛ｪ隸ｻ';
-$labels['collapse-all'] = '謾ｶ蜷亥�ｨ驛ｨ';
-$labels['threaded'] = '郤ｿ邏｢';
+$labels['collapse-all'] = '謾ｶ襍ｷ蜈ｨ驛ｨ';
+$labels['threaded'] = '謇�譛蛾ぐ莉ｶ';
 
 $labels['autoexpand_threads'] = '螻募ｼ�豸域�ｯ荳ｻ鬚�';
 $labels['do_expand'] = '謇�譛我ｸｻ鬚�';
@@ -188,7 +190,7 @@ $labels['listsorting'] = '謗貞ｺ丞��';
 $labels['listorder'] = '謗貞ｺ�';
 $labels['listmode'] = '蛻苓｡ｨ隗�蝗ｾ譬ｷ蠑�';
 
-$labels['folderactions'] = '逶ｮ蠖墓桃菴�...';
+$labels['folderactions'] = '譁�莉ｶ螟ｹ謫堺ｽ�...';
 $labels['compact'] = '蜴狗ｼｩ';
 $labels['empty'] = '貂�遨ｺ';
 
@@ -197,31 +199,33 @@ $labels['unknown']  = '譛ｪ遏･';
 $labels['unlimited']  = '譌�髯仙宛';
 
 $labels['quicksearch']  = '蠢ｫ騾滓衍謇ｾ';
-$labels['resetsearch']  = '貂�遨ｺ譟･謇ｾ蜀�螳ｹ';
-$labels['searchmod']  = '謳懷ｯｻ讓｡蠑�';
-$labels['msgtext']  = '謨ｴ荳ｪ驍ｮ莉ｶ';
+$labels['resetsearch']  = '貂�遨ｺ';
+$labels['searchmod']  = '菫ｮ謾ｹ謳懃ｴ｢';
+$labels['msgtext']  = '謨ｴ蟆�驍ｮ莉ｶ';
 $labels['body']  = '豁｣譁�';
 
 $labels['openinextwin'] = '蝨ｨ譁ｰ遯怜哨荳ｭ謇灘ｼ�';
-$labels['emlsave'] = '荳玖ｽｽ�ｼ�.eml�ｼ�';
+$labels['emlsave'] = '荳玖ｽｽ(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
-$labels['editasnew']      = '郛冶ｾ台ｸｺ譁ｰ驍ｮ莉ｶ';
+$labels['editasnew']      = '莉･譁ｰ驍ｮ莉ｶ郛冶ｾ�';
 $labels['send']           = '蜿鷹��';
 $labels['sendmessage']    = '遶句叉蜿鷹��';
 $labels['savemessage']    = '菫晏ｭ倅ｸｺ闕臥ｨｿ';
 $labels['addattachment']  = '豺ｻ蜉�髯�莉ｶ';
 $labels['charset']        = '蟄礼ｬｦ髮�';
 $labels['editortype']     = '郛冶ｾ大勣邀ｻ蝙�';
-$labels['returnreceipt']  = '驍ｮ莉ｶ蝗樊鴬';
-$labels['dsn']            = '謚暮�堤憾諤∵署遉ｺ';
-$labels['mailreplyintro'] = '莠� $date, $sender 蝗槫､�:';
-$labels['originalmessage'] = '蜴溷ｧ倶ｿ｡莉ｶ';
+$labels['returnreceipt']  = '髴�隕∝ｷｲ隸ｻ蝗樊鴬';
+$labels['dsn']            = '謚暮�堤憾諤�騾夂衍';
+$labels['mailreplyintro'] = '蝨ｨ $date�ｼ�$sender 蜀咎％�ｼ�';
+$labels['originalmessage'] = '蜴溷ｧ矩ぐ莉ｶ';
 
 $labels['editidents']    = '郛冶ｾ題ｺｫ莉ｽ';
 $labels['spellcheck']    = '諡ｼ蜀�';
 $labels['checkspelling'] = '諡ｼ蜀呎｣�譟･';
-$labels['resumeediting'] = '驥肴眠郛冶ｾ�';
+$labels['resumeediting'] = '扈ｧ扈ｭ郛冶ｾ�';
 $labels['revertto']      = '諱｢螟崎�ｳ';
 
 $labels['attach'] = '髯�蜉�';
@@ -237,19 +241,19 @@ $labels['normal']  = '譎ｮ騾�';
 $labels['high']    = '鬮�';
 $labels['highest'] = '譛�鬮�';
 
-$labels['nosubject']  = '�ｼ域裏荳ｻ鬚假ｼ�';
+$labels['nosubject']  = '(譌�荳ｻ鬚�)';
 $labels['showimages'] = '譏ｾ遉ｺ蝗ｾ迚�';
 $labels['alwaysshow'] = '諤ｻ譏ｯ蝨ｨ譚･閾ｪ $sender 逧�驍ｮ莉ｶ荳ｭ譏ｾ遉ｺ蝗ｾ迚�';
-$labels['isdraft']    = '霑呎弍驍ｮ莉ｶ闕臥ｨｿ';
-$labels['andnmore']   = '$nr more...';
+$labels['isdraft']    = '霑呎弍荳�蟆∬拷遞ｿ';
+$labels['andnmore']   = '隨ｬ$nr蟆∵�匁峩螟�...';
 $labels['togglemoreheaders'] = '譏ｾ遉ｺ譖ｴ螟壽ｶ域�ｯ螟ｴ';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = '蛻�謐｢閾ｳ蜴溷ｧ区ｶ域�ｯ螟ｴ';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '郤ｯ譁�譛ｬ';
-$labels['savesentmessagein'] = '蟆�蟾ｲ蜿鷹��驍ｮ莉ｶ菫晏ｭ伜芦';
+$labels['savesentmessagein'] = '菫晏ｭ伜ｷｲ蜿鷹��驍ｮ莉ｶ閾ｳ';
 $labels['dontsave'] = '荳堺ｿ晏ｭ�';
-$labels['maxuploadsize'] = '蜈∬ｮｸ逧�譛�螟ｧ譁�莉ｶ螟ｧ蟆乗弍 $size';
+$labels['maxuploadsize'] = '荳贋ｼ�髯�莉ｶ譛�螟ｧ荳崎ｶ�霑� $size';
 
 $labels['addcc'] = '豺ｻ蜉�謚�騾�';
 $labels['addbcc'] = '豺ｻ蜉�蟇�騾�';
@@ -257,10 +261,10 @@ $labels['addreplyto'] = '豺ｻ蜉�蝗槫､�';
 $labels['addfollowupto'] = '豺ｻ蜉�謚暮�堤ｻ�';
 
 // mdn
-$labels['mdnrequest'] = '蜿台ｻｶ莠ｺ隕∵ｱょ惠謔ｨ髦�隸ｻ霑吝ｰ�驍ｮ莉ｶ譌ｶ蜿鷹��騾夂衍縲よお譏ｯ蜷ｦ蟶梧悍騾夂衍蜿台ｻｶ莠ｺ�ｼ�';
-$labels['receiptread'] = '蜿鷹�∝屓謇ｧ�ｼ亥ｷｲ隸ｻ�ｼ�';
+$labels['mdnrequest'] = '蜿台ｻｶ莠ｺ隕∵ｱょ惠謔ｨ髦�隸ｻ霑吝ｰ�驍ｮ莉ｶ譌ｶ蜿鷹�∝ｷｲ隸ｻ騾夂衍縲よお譏ｯ蜷ｦ蟶梧悍騾夂衍蜿台ｻｶ莠ｺ�ｼ�';
+$labels['receiptread'] = '蜿鷹�∝屓謇ｧ(蟾ｲ隸ｻ)';
 $labels['yourmessage'] = '霑呎弍謔ｨ逧�驍ｮ莉ｶ蝗樊鴬';
-$labels['receiptnote'] = '豕ｨ諢擾ｼ壼屓謇ｧ蜿ｪ陦ｨ遉ｺ驍ｮ莉ｶ蝨ｨ謾ｶ莉ｶ莠ｺ逧�逕ｵ閼台ｸ願｢ｫ謇灘ｼ�霑��ｼ御ｸ崎｡ｨ遉ｺ謾ｶ莉ｶ莠ｺ蟾ｲ扈城��隸ｻ謌門ｷｲ逅�隗｣驍ｮ莉ｶ逧�蜀�螳ｹ縲�';
+$labels['receiptnote'] = '豕ｨ諢擾ｼ壼屓謇ｧ蜿ｪ陦ｨ遉ｺ驍ｮ莉ｶ蝨ｨ謾ｶ莉ｶ莠ｺ逧�逕ｵ閼台ｸ願｢ｫ謇灘ｼ�霑��ｼ御ｸ崎｡ｨ遉ｺ謾ｶ莉ｶ莠ｺ蟾ｲ扈城��隸ｻ謌紋ｺ�隗｣驍ｮ莉ｶ蜀�螳ｹ縲�';
 
 // address boook
 $labels['name']         = '譏ｾ遉ｺ蜷咲ｧｰ';
@@ -272,9 +276,9 @@ $labels['namesuffix']   = '蜷守ｼ�';
 $labels['nickname']     = '譏ｵ遘ｰ';
 $labels['jobtitle']     = '閨御ｽ�';
 $labels['department']   = '驛ｨ髣ｨ';
-$labels['gender']       = 'Gender';
+$labels['gender']       = '諤ｧ蛻ｫ';
 $labels['maidenname']   = '螽伜ｮｶ蟋�';
-$labels['email']        = 'Email';
+$labels['email']        = '驍ｮ莉ｶ蝨ｰ蝮�';
 $labels['phone']        = '逕ｵ隸�';
 $labels['address']      = '蝨ｰ蝮�';
 $labels['street']       = '陦鈴％';
@@ -285,14 +289,14 @@ $labels['country']      = '蝗ｽ螳ｶ';
 $labels['birthday']     = '逕滓律';
 $labels['anniversary']  = '郤ｪ蠢ｵ譌･';
 $labels['website']      = '荳ｻ鬘ｵ';
-$labels['instantmessenger'] = 'QQ';
+$labels['instantmessenger'] = '蜊ｳ譌ｶ騾夊ｮｯ';
 $labels['notes'] = '螟�豕ｨ';
 $labels['male']   = '逕ｷ';
 $labels['female'] = '螂ｳ';
 $labels['manager'] = '扈冗炊';
 $labels['assistant'] = '蜉ｩ逅�';
 $labels['spouse'] = '驟榊�ｶ';
-$labels['allfields'] = '謇�譛蛾｡ｹ逶ｮ';
+$labels['allfields'] = '謇�譛画�冗岼';
 $labels['search'] = '譟･隸｢';
 $labels['advsearch'] = '鬮倡ｺｧ譟･隸｢';
 $labels['advanced'] = '鬮倡ｺｧ騾蛾｡ｹ';
@@ -302,7 +306,7 @@ $labels['typehome']   = '螳ｶ蠎ｭ';
 $labels['typework']   = '蟾･菴�';
 $labels['typeother']  = '蜈ｶ莉�';
 $labels['typemobile']  = '謇区惻';
-$labels['typemain']  = '荳ｻ';
+$labels['typemain']  = '荳ｻ隕�';
 $labels['typehomefax']  = '螳ｶ蠎ｭ莨�逵�';
 $labels['typeworkfax']  = '蟾･菴應ｼ�逵�';
 $labels['typecar']  = '霓ｦ迚�';
@@ -311,10 +315,10 @@ $labels['typevideo']  = '隗�鬚�';
 $labels['typeassistant']  = '蜉ｩ逅�';
 $labels['typehomepage']  = '荳ｻ鬘ｵ';
 $labels['typeblog'] = '蜊壼ｮ｢';
-$labels['typeprofile'] = '襍�蜴�';
+$labels['typeprofile'] = '襍�譁�';
 
-$labels['addfield'] = '蠅槫刈鬘ｹ..';
-$labels['addcontact'] = '豺ｻ蜉�閨皮ｳｻ莠ｺ';
+$labels['addfield'] = '譁ｰ蠅樊擅逶ｮ...';
+$labels['addcontact'] = '譁ｰ蟒ｺ閨皮ｳｻ莠ｺ';
 $labels['editcontact'] = '郛冶ｾ題＃邉ｻ莠ｺ';
 $labels['contacts'] = '閨皮ｳｻ莠ｺ';
 $labels['contactproperties'] = '閨皮ｳｻ莠ｺ菫｡諱ｯ';
@@ -324,24 +328,24 @@ $labels['edit']   = '郛冶ｾ�';
 $labels['cancel'] = '蜿匁ｶ�';
 $labels['save']   = '菫晏ｭ�';
 $labels['delete'] = '蛻�髯､';
-$labels['rename'] = '譖ｴ蜷�';
+$labels['rename'] = '驥榊多蜷�';
 $labels['addphoto'] = '荳贋ｼ�';
-$labels['replacephoto'] = '隕�逶�';
+$labels['replacephoto'] = '譖ｿ謐｢辣ｧ迚�';
 $labels['uploadphoto'] = '荳贋ｼ�辣ｧ迚�';
 
 $labels['newcontact']     = '譁ｰ蟒ｺ閨皮ｳｻ莠ｺ';
 $labels['deletecontact']  = '蛻�髯､騾我ｸｭ逧�閨皮ｳｻ莠ｺ';
-$labels['composeto']      = '蜀吩ｿ｡扈�';
+$labels['composeto']      = '蜀吩ｿ｡閾ｳ騾我ｸｭ逧�閨皮ｳｻ莠ｺ';
 $labels['contactsfromto'] = '隨ｬ $from 蛻ｰ $to 荳ｪ閨皮ｳｻ莠ｺ�ｼ悟�ｱ $count 荳ｪ';
 $labels['print']          = '謇灘魂';
 $labels['export']         = '蟇ｼ蜃ｺ';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = '莉･ vCard 譬ｼ蠑丞ｯｼ蜃ｺ閨皮ｳｻ莠ｺ';
-$labels['newcontactgroup'] = '蛻帛ｻｺ譁ｰ逧�扈�';
-$labels['grouprename']    = '驥榊多蜷咲ｻ�';
-$labels['groupdelete']    = '蛻�髯､扈�';
-$labels['groupremoveselected'] = '莉主��扈�荳ｭ遘ｻ髯､騾我ｸｭ逧�閨皮ｳｻ莠ｺ';
+$labels['exportall']      = '蟇ｼ蜃ｺ蜈ｨ驛ｨ';
+$labels['exportsel']      = '蟇ｼ蜃ｺ騾我ｸｭ';
+$labels['exportvcards']   = '蟇ｼ蜃ｺ閨皮ｳｻ莠ｺ荳ｺ vCard 譬ｼ蠑�';
+$labels['newcontactgroup'] = '蛻帛ｻｺ譁ｰ逧�閨皮ｳｻ莠ｺ鄒､扈�';
+$labels['grouprename']    = '驥榊多蜷咲ｾ､扈�';
+$labels['groupdelete']    = '蛻�髯､鄒､扈�扈�';
+$labels['groupremoveselected'] = '蛻�髯､騾我ｸｭ';
 
 $labels['previouspage']   = '荳贋ｸ�鬘ｵ';
 $labels['firstpage']      = '隨ｬ荳�鬘ｵ';
@@ -356,19 +360,19 @@ $labels['searchsave'] = '菫晏ｭ俶頗邏｢';
 $labels['searchdelete'] = '蛻�髯､謳懃ｴ｢';
 
 $labels['import'] = '蟇ｼ蜈･';
-$labels['importcontacts'] = '蟇ｼ蜈･閨皮ｳｻ莠ｺ';
+$labels['importcontacts'] = '蟇ｼ蜈･騾夊ｮｯ蠖�';
 $labels['importfromfile'] = '莉取枚莉ｶ蟇ｼ蜈･';
-$labels['importtarget'] = '蠅槫刈譁ｰ閨皮ｳｻ莠ｺ蛻ｰ騾夊ｮｯ蠖�:';
-$labels['importreplace'] = '譖ｿ謐｢謨ｴ荳ｪ蝨ｰ蝮�邁ｿ';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importtarget'] = '豺ｻ蜉�譁ｰ閨皮ｳｻ莠ｺ閾ｳ騾夊ｮｯ蠖�:';
+$labels['importreplace'] = '譖ｿ謐｢蜈ｨ驛ｨ騾夊ｮｯ蠖�';
+$labels['importdesc'] = '謔ｨ蜿ｯ莉･莉朱�夊ｮｯ蠖墓枚莉ｶ荳贋ｼ�閨皮ｳｻ莠ｺ�ｼ檎岼蜑榊ｷｲ謾ｯ謖� <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 蜥� CSV(騾怜捷蛻�髫�)譬ｼ蠑�';
 $labels['done'] = '螳梧��';
 
 // settings
 $labels['settingsfor'] = '隶ｾ鄂ｮ';
 $labels['about'] = '蜈ｳ莠�';
-$labels['preferences'] = '蛛丞･ｽ隶ｾ鄂ｮ';
-$labels['userpreferences'] = '荳ｪ莠ｺ蛛丞･ｽ';
-$labels['editpreferences'] = '菫ｮ謾ｹ荳ｪ莠ｺ蛛丞･ｽ';
+$labels['preferences'] = '騾蛾｡ｹ';
+$labels['userpreferences'] = '荳ｪ莠ｺ騾蛾｡ｹ';
+$labels['editpreferences'] = '菫ｮ謾ｹ荳ｪ莠ｺ騾蛾｡ｹ';
 
 $labels['identities'] = '蜿台ｻｶ霄ｫ莉ｽ';
 $labels['manageidentities'] = '邂｡逅�豁､雍ｦ蜿ｷ逧�霄ｫ莉ｽ';
@@ -380,7 +384,7 @@ $labels['edititem'] = '郛冶ｾ第擅逶ｮ';
 $labels['preferhtml'] = '莉･ HTML 譬ｼ蠑乗仞遉ｺ';
 $labels['defaultcharset'] = '鮟倩ｮ､蟄礼ｬｦ髮�';
 $labels['htmlmessage'] = 'HTML 驍ｮ莉ｶ';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = '驛ｨ蛻�';
 $labels['digitalsig'] = '謨ｰ蟄礼ｭｾ蜷�';
 $labels['dateformat'] = '譌･譛滓�ｼ蠑�';
 $labels['timeformat'] = '譌ｶ髣ｴ譬ｼ蠑�';
@@ -392,12 +396,13 @@ $labels['timezone']  = '譌ｶ蛹ｺ';
 $labels['pagesize']  = '豈城｡ｵ譏ｾ遉ｺ逧�驍ｮ莉ｶ謨ｰ驥�';
 $labels['signature'] = '遲ｾ蜷�';
 $labels['dstactive']  = '螟丈ｻ､譌ｶ';
-$labels['showinextwin'] = 'Open message in a new window';
+$labels['showinextwin'] = '蝨ｨ譁ｰ遯怜哨荳ｭ謇灘ｼ�';
 $labels['composeextwin'] = '蝨ｨ譁ｰ遯怜哨荳ｭ謦ｰ蜀�';
 $labels['htmleditor'] = '菴ｿ逕ｨ HTML 郛冶ｾ大勣';
-$labels['htmlonreply'] = '莉�蠖灘屓螟工TML驍ｮ莉ｶ';
+$labels['htmlonreply'] = '莉�蠖灘屓螟� HTML 驍ｮ莉ｶ';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '菴ｿ逕ｨ HTML 遲ｾ蜷�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '譏ｾ遉ｺ鬚�隗育ｪ怜哨';
 $labels['skin'] = '逡碁擇逧ｮ閧､';
 $labels['logoutclear'] = '騾�蜃ｺ譌ｶ貂�遨ｺ蝗樊噺遶�';
@@ -422,7 +427,7 @@ $labels['always'] = '諤ｻ譏ｯ';
 $labels['showinlineimages'] = '蝨ｨ驍ｮ莉ｶ荳区婿譏ｾ遉ｺ髯�莉ｶ荳ｭ逧�蝗ｾ迚�';
 $labels['autosavedraft']  = '閾ｪ蜉ｨ菫晏ｭ伜芦闕臥ｨｿ邂ｱ';
 $labels['everynminutes']  = '豈城囈 $n 蛻�髓�';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = '蛻ｷ譁ｰ髣ｴ髫�';
 $labels['never']  = '莉惹ｸ�';
 $labels['immediately']  = '遶句叉';
 $labels['messagesdisplaying'] = '譏ｾ遉ｺ蜿よ焚';
@@ -431,12 +436,12 @@ $labels['mimeparamfolding'] = '髯�莉ｶ蜷�';
 $labels['2231folding'] = '螳梧紛逧� RFC 2231�ｼ�Thunderbird�ｼ�';
 $labels['miscfolding'] = 'RFC 2047/2232�ｼ�MS Outlook�ｼ�';
 $labels['2047folding'] = '螳梧紛逧� RFC 2047�ｼ亥�ｶ螳��ｼ�';
-$labels['force7bit'] = '蟇ｹ8菴榊ｭ礼ｬｦ菴ｿ逕ｨMIME郛也��';
+$labels['force7bit'] = '蟇ｹ8菴榊ｭ礼ｬｦ菴ｿ逕ｨ MIME 郛也��';
 $labels['advancedoptions'] = '鬮倡ｺｧ騾蛾｡ｹ';
 $labels['focusonnewmessage'] = '譁ｰ驍ｮ莉ｶ蛻ｰ霎ｾ譌ｶ蟆�遯怜哨謠仙合荳ｺ辟ｦ轤ｹ遯怜哨';
 $labels['checkallfolders'] = '譽�譟･謇�譛蛾ぐ莉ｶ螟ｹ驥檎噪譁ｰ驍ｮ莉ｶ';
-$labels['displaynext'] = '蠖馴ぐ莉ｶ蛻�謗�/遘ｻ蜉ｨ蜷取仞遉ｺ荳倶ｸ�蟆�驍ｮ莉ｶ';
-$labels['defaultfont'] = '鮟倩ｮ､逧ЗTML譬ｼ蠑丞ｭ嶺ｽ�';
+$labels['displaynext'] = '蠖馴ぐ莉ｶ蛻�髯､/遘ｻ蜉ｨ蜷取仞遉ｺ荳倶ｸ�蟆�驍ｮ莉ｶ';
+$labels['defaultfont'] = '鮟倩ｮ､逧� HTML 譬ｼ蠑丞ｭ嶺ｽ�';
 $labels['mainoptions'] = '荳ｻ隕�騾蛾｡ｹ';
 $labels['browseroptions'] = '豬剰ｧ亥勣騾蛾｡ｹ';
 $labels['section'] = '鬘ｹ逶ｮ';
@@ -444,16 +449,13 @@ $labels['maintenance'] = '扈ｴ謚､';
 $labels['newmessage'] = '譁ｰ驍ｮ莉ｶ';
 $labels['signatureoptions'] = '遲ｾ蜷埼�蛾｡ｹ';
 $labels['whenreplying'] = '蠖灘屓螟肴慮';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = '荳崎ｦ∝ｼ慕畑蜴溷ｧ矩ぐ莉ｶ';
 $labels['replytopposting'] = '蝨ｨ蜴滓枚荳企擇蠑�蟋区眠驍ｮ莉ｶ';
 $labels['replybottomposting'] = '蝨ｨ蜴滓枚荳矩擇蠑�蟋区眠驍ｮ莉ｶ';
 $labels['replyremovesignature'] = '蠖灘屓螟肴慮莉朱ぐ莉ｶ遘ｻ髯､蜴溷ｧ狗ｭｾ蜷�';
 $labels['autoaddsignature'] = '閾ｪ蜉ｨ謠貞�･遲ｾ蜷�';
 $labels['newmessageonly'] = '莉�譁ｰ驍ｮ莉ｶ';
 $labels['replyandforwardonly'] = '莉�蝗槫､榊柱霓ｬ蜿鷹ぐ莉ｶ';
-$labels['replysignaturepos'] = '蠖灘屓螟肴�冶ｽｬ蜿第慮謠貞�･遲ｾ蜷�';
-$labels['belowquote'] = '菴堺ｺ主次譁�荳区婿';
-$labels['abovequote'] = '菴堺ｺ主次譁�荳頑婿';
 $labels['insertsignature'] = '謠貞�･遲ｾ蜷�';
 $labels['previewpanemarkread']  = '譬�隶ｰ鬚�隗磯ぐ莉ｶ荳ｺ蟾ｲ隸ｻ';
 $labels['afternseconds']  = '$n 遘剃ｹ句錘';
@@ -462,7 +464,7 @@ $labels['reqdsn'] = '諤ｻ譏ｯ隕∵ｱよ兜騾堤憾諤�騾夂衍';
 $labels['replysamefolder'] = '菫晏ｭ伜屓螟埼ぐ莉ｶ蛻ｰ驍ｮ莉ｶ逶ｸ蜷檎噪逶ｮ蠖�';
 $labels['defaultabook'] = '鮟倩ｮ､蝨ｰ蝮�阮�';
 $labels['autocompletesingle'] = '霍ｳ霑�閾ｪ蜉ｨ螳梧�千噪逕ｵ蟄宣ぐ莉ｶ蝨ｰ蝮�';
-$labels['listnamedisplay'] = 'List contacts as';
+$labels['listnamedisplay'] = '蛻怜�ｺ閨皮ｳｻ莠ｺ荳ｺ';
 $labels['spellcheckbeforesend'] = '蜿鷹ぐ莉ｶ蜑崎ｿ幄｡梧蕎蜀呎｣�譟･';
 $labels['spellcheckoptions'] = '諡ｼ蜀呎｣�譟･騾蛾｡ｹ';
 $labels['spellcheckignoresyms'] = '蠢ｽ逡･蟶ｦ隨ｦ蜿ｷ逧�蜊戊ｯ�';
@@ -470,9 +472,9 @@ $labels['spellcheckignorenums'] = '蠢ｽ逡･蟶ｦ謨ｰ蟄礼噪蜊戊ｯ�';
 $labels['spellcheckignorecaps'] = '蠢ｽ逡･謇�譛牙､ｧ蜀吝ｭ玲ｯ咲噪蜊戊ｯ�';
 $labels['addtodict'] = '豺ｻ蜉�蛻ｰ蟄怜�ｸ荳ｭ';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['forwardmode'] = '驍ｮ莉ｶ霓ｬ蜿第婿蠑�';
+$labels['inline'] = '蜀�蠏�';
+$labels['asattachment'] = '菴應ｸｺ髯�莉ｶ';
 
 $labels['folder']  = '逶ｮ蠖慕ｮ｡逅�';
 $labels['folders']  = '逶ｮ蠖慕ｮ｡逅�';
@@ -503,9 +505,9 @@ $labels['undo'] = '謦､髞�';
 $labels['installedplugins'] = '蟾ｲ螳芽｣�謠剃ｻｶ';
 $labels['plugin'] = '謠剃ｻｶ';
 $labels['version'] = '迚域悽';
-$labels['source'] = '貅�';
+$labels['source'] = '貅蝉ｻ｣遐�';
 $labels['license'] = '隶ｸ蜿ｯ蜊剰ｮｮ';
-$labels['support'] = '闔ｷ蜿匁髪謖�';
+$labels['support'] = '謾ｯ謖�';
 
 // units
 $labels['B'] = 'B';
@@ -519,7 +521,7 @@ $labels['english'] = '闍ｱ隸ｭ';
 $labels['westerneuropean'] = '隘ｿ谺ｧ';
 $labels['easterneuropean'] = '荳懈ｬｧ';
 $labels['southeasterneuropean'] = '荳懷漉谺ｧ';
-$labels['baltic'] = '豕｢鄂礼噪豬ｷ';
+$labels['baltic'] = '豕｢鄂礼噪隸ｭ';
 $labels['cyrillic'] = '隘ｿ驥悟ｰ碑ｯｭ';
 $labels['arabic'] = '髦ｿ諡我ｼｯ隸ｭ';
 $labels['greek'] = '蟶瑚�願ｯｭ';
@@ -527,7 +529,7 @@ $labels['hebrew'] = '蟶御ｼｯ譚･隸ｭ';
 $labels['turkish'] = '蝨溯�ｳ蜈ｶ隸ｭ';
 $labels['nordic'] = '蛹玲ｬｧ';
 $labels['thai'] = '豕ｰ隸ｭ';
-$labels['celtic'] = '蝪槫ｰ皮音';
+$labels['celtic'] = '蝪槫ｰ皮音隸ｭ';
 $labels['vietnamese'] = '雜雁漉隸ｭ';
 $labels['japanese'] = '譌･譁�';
 $labels['korean'] = '髻ｩ隸ｭ';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 31c6051f7..43703e311 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -19,35 +19,37 @@
 $messages = array();
 $messages['errortitle']  = '蜿醍函髞呵ｯｯ�ｼ�';
 $messages['loginfailed']  = '逋ｻ蠖募､ｱ雍･縲�';
-$messages['cookiesdisabled'] = '謔ｨ逧�豬剰ｧ亥勣荳肴磁蜿� cookies縲�';
-$messages['sessionerror'] = '莨夊ｯ晏ｷｲ霑�譛溘��';
-$messages['storageerror'] = '霑樊磁驍ｮ莉ｶ譛榊苅蝎ｨ螟ｱ雍･縲�';
+$messages['cookiesdisabled'] = '謔ｨ逧�豬剰ｧ亥勣荳肴髪謖� Cookies縲�';
+$messages['sessionerror'] = '莨夊ｯ晄裏謨域�門ｷｲ霑�譛溘��';
+$messages['storageerror'] = '霑樊磁閾ｳ IMAP 譛榊苅蝎ｨ螟ｱ雍･縲�';
 $messages['servererror'] = '譛榊苅蝎ｨ髞呵ｯｯ�ｼ�';
-$messages['servererrormsg'] = '譛榊苅蝎ｨ髞呵ｯｯ: $msg';
+$messages['servererrormsg'] = '譛榊苅蝎ｨ髞呵ｯｯ�ｼ�$msg';
 $messages['dberror'] = '謨ｰ謐ｮ蠎馴漠隸ｯ�ｼ�';
 $messages['requesttimedout'] = '隸ｷ豎りｶ�譌ｶ';
-$messages['errorreadonly'] = '荳榊庄蟇ｹ蜿ｪ隸ｻ譁�莉ｶ螟ｹ霑幄｡梧桃菴懊��';
-$messages['errornoperm'] = '譌�譚�髯先桃菴�';
-$messages['invalidrequest'] = '譌�謨育噪隸ｷ豎ゑｼ∵焚謐ｮ菫晏ｭ伜､ｱ雍･縲�';
-$messages['invalidhost'] = '髱樊ｳ穂ｸｻ譛ｺ蜷阪��';
+$messages['errorreadonly'] = '譌�豕募ｮ梧�先桃菴懊�よ枚莉ｶ螟ｹ荳ｺ蜿ｪ隸ｻ縲�';
+$messages['errornoperm'] = '譌�豕募ｮ梧�先桃菴懊�よｲ｡譛画揀髯舌��';
+$messages['erroroverquota'] = '譌�豕募ｮ梧�先桃菴懊�よｲ｡譛芽ｶｳ螟溽噪逎∫尨遨ｺ髣ｴ縲�';
+$messages['erroroverquotadelete'] = '豐｡譛芽ｶｳ螟溽噪逎∫尨遨ｺ髣ｴ縲りｯｷ菴ｿ逕ｨ SHIFT+DEL 蛻�髯､荳�驛ｨ蛻�驍ｮ莉ｶ縲�';
+$messages['invalidrequest'] = '隸ｷ豎よ裏謨茨ｼ∵悴菫晏ｭ俶焚謐ｮ縲�';
+$messages['invalidhost'] = '譌�謨育噪荳ｻ譛ｺ蜷阪��';
 $messages['nomessagesfound'] = '豁､驍ｮ莉ｶ螟ｹ蜀�譌�驍ｮ莉ｶ縲�';
-$messages['loggedout'] = '豕ｨ髞�謌仙粥�ｼ悟�崎ｧ��ｼ�';
-$messages['mailboxempty'] = '驍ｮ莉ｶ螟ｹ荳ｺ遨ｺ';
+$messages['loggedout'] = '謔ｨ蟾ｲ謌仙粥豕ｨ髞��ｼ悟�崎ｧ��ｼ�';
+$messages['mailboxempty'] = '驍ｮ莉ｶ螟ｹ荳ｺ遨ｺ縲�';
 $messages['refreshing'] = '豁｣蝨ｨ蛻ｷ譁ｰ...';
-$messages['loading'] = '豁｣蝨ｨ霓ｽ蜈･...';
+$messages['loading'] = '豁｣蝨ｨ逋ｻ蠖�...';
 $messages['uploading'] = '豁｣蝨ｨ荳贋ｼ�譁�莉ｶ...';
 $messages['uploadingmany'] = '豁｣蝨ｨ荳贋ｼ�譁�莉ｶ...';
 $messages['loadingdata'] = '豁｣蝨ｨ霓ｽ蜈･謨ｰ謐ｮ...';
 $messages['checkingmail'] = '豁｣蝨ｨ譽�譟･譁ｰ驍ｮ莉ｶ...';
-$messages['sendingmessage'] = '豁｣蝨ｨ蜿鷹��驍ｮ莉ｶ...';
-$messages['messagesent'] = '驍ｮ莉ｶ蜿鷹�∵�仙粥縲�';
+$messages['sendingmessage'] = '豁｣蝨ｨ蜿鷹��...';
+$messages['messagesent'] = '驍ｮ莉ｶ蟾ｲ蜿鷹�√��';
 $messages['savingmessage'] = '豁｣蝨ｨ菫晏ｭ倬ぐ莉ｶ...';
 $messages['messagesaved'] = '驍ｮ莉ｶ蟾ｲ證ょｭ倩�ｳ闕臥ｨｿ邂ｱ縲�';
 $messages['successfullysaved'] = '菫晏ｭ俶�仙粥縲�';
-$messages['addedsuccessfully'] = '謌仙粥豺ｻ蜉�閨皮ｳｻ莠ｺ縲�';
+$messages['addedsuccessfully'] = '閨皮ｳｻ莠ｺ蟾ｲ豺ｻ蜉�縲�';
 $messages['contactexists'] = '蠖灘燕閨皮ｳｻ莠ｺ逧�逕ｵ蟄宣ぐ莉ｶ蝨ｰ蝮�蟾ｲ蟄伜惠縲�';
 $messages['contactnameexists'] = '蟾ｲ蟄伜惠蜷悟錐閨皮ｳｻ莠ｺ縲�';
-$messages['blockedimages'] = '荳ｺ菫晄侃髫千ｧ��ｼ梧ｭ､驍ｮ莉ｶ荳ｭ逧�霑懃ｨ句崟迚�譛ｪ莠域仞遉ｺ縲�';
+$messages['blockedimages'] = '逕ｱ莠惹ｿ晄侃髫千ｧ��ｼ梧ｭ､驍ｮ莉ｶ荳ｭ逧�霑懃ｨ句崟迚�譛ｪ莠域仞遉ｺ縲�';
 $messages['encryptedmessage'] = '謚ｱ豁会ｼ∬ｯ･驍ｮ莉ｶ蟾ｲ陲ｫ蜉�蟇��ｼ梧裏豕墓仞遉ｺ縲�';
 $messages['nocontactsfound'] = '譛ｪ謇ｾ蛻ｰ閨皮ｳｻ莠ｺ縲�';
 $messages['contactnotfound'] = '譛ｪ謇ｾ蛻ｰ謖�螳夂噪閨皮ｳｻ莠ｺ縲�';
@@ -60,74 +62,74 @@ $messages['errormoving'] = '譌�豕慕ｧｻ蜉ｨ驍ｮ莉ｶ縲�';
 $messages['errorcopying'] = '譌�豕募､榊宛驍ｮ莉ｶ縲�';
 $messages['errordeleting'] = '譌�豕募唖髯､驍ｮ莉ｶ縲�';
 $messages['errormarking'] = '譌�豕墓��隶ｰ驍ｮ莉ｶ縲�';
-$messages['deletecontactconfirm']  = '遑ｮ螳夊ｦ∝唖髯､蟾ｲ騾我ｸｭ逧�閨皮ｳｻ莠ｺ�ｼ�';
-$messages['deletegroupconfirm']  = '遑ｮ螳夊ｦ∝唖髯､莉･騾我ｸｭ逧�扈�?';
-$messages['deletemessagesconfirm'] = '遑ｮ螳夊ｦ∝唖髯､蟾ｲ騾我ｸｭ逧�驍ｮ莉ｶ�ｼ�';
-$messages['deletefolderconfirm']  = '遑ｮ螳夊ｦ∝唖髯､蟾ｲ騾我ｸｭ逧�驍ｮ莉ｶ螟ｹ�ｼ�';
-$messages['purgefolderconfirm']  = '譏ｯ蜷ｦ遑ｮ隶､隕∝唖髯､蠖灘燕驍ｮ莉ｶ螟ｹ荳ｭ逧�謇�譛蛾ぐ莉ｶ�ｼ�';
+$messages['deletecontactconfirm']  = '譏ｯ蜷ｦ蛻�髯､騾我ｸｭ逧�閨皮ｳｻ莠ｺ�ｼ�';
+$messages['deletegroupconfirm']  = '譏ｯ蜷ｦ蛻�髯､騾我ｸｭ逧�鄒､扈�?';
+$messages['deletemessagesconfirm'] = '譏ｯ蜷ｦ蛻�髯､騾我ｸｭ逧�驍ｮ莉ｶ�ｼ�';
+$messages['deletefolderconfirm']  = '譏ｯ蜷ｦ蛻�髯､騾我ｸｭ逧�驍ｮ莉ｶ螟ｹ�ｼ�';
+$messages['purgefolderconfirm']  = '譏ｯ蜷ｦ蛻�髯､蠖灘燕驍ｮ莉ｶ螟ｹ荳ｭ逧�蜈ｨ驛ｨ驍ｮ莉ｶ�ｼ�';
 $messages['contactdeleting'] = '豁｣蝨ｨ蛻�髯､閨皮ｳｻ莠ｺ...';
-$messages['groupdeleting'] = '豁｣蝨ｨ蛻�髯､扈�...';
+$messages['groupdeleting'] = '豁｣蝨ｨ蛻�髯､鄒､扈�...';
 $messages['folderdeleting'] = '豁｣蝨ｨ蛻�髯､譁�莉ｶ螟ｹ...';
 $messages['foldermoving'] = '豁｣蝨ｨ遘ｻ蜉ｨ譁�莉ｶ螟ｹ...';
 $messages['foldersubscribing'] = '隶｢髦�譁�莉ｶ螟ｹ荳ｭ...';
 $messages['folderunsubscribing'] = '騾�隶｢荳ｭ...';
-$messages['formincomplete'] = '蠖灘燕陦ｨ蜊墓悴蝪ｫ蜀吝ｮ梧紛�ｼ瑚ｯｷ螳梧紛蝪ｫ蜀吶��';
+$messages['formincomplete'] = '陦ｨ蜊墓悴蝪ｫ蜀吝ｮ梧紛縲�';
 $messages['noemailwarning'] = '隸ｷ霎灘�･荳�荳ｪ譛画譜逧�驍ｮ莉ｶ蝨ｰ蝮�縲�';
-$messages['nonamewarning']  = '隸ｷ霎灘�･蜷榊ｭ励��';
-$messages['nopagesizewarning'] = '隸ｷ霎灘�･豈城｡ｵ譏ｾ遉ｺ逧�驍ｮ莉ｶ謨ｰ驥�';
+$messages['nonamewarning']  = '隸ｷ霎灘�･蜷咲ｧｰ縲�';
+$messages['nopagesizewarning'] = '隸ｷ霎灘�･豈城｡ｵ譏ｾ遉ｺ逧�驍ｮ莉ｶ謨ｰ驥上��';
 $messages['nosenderwarning'] = '隸ｷ霎灘�･蜿台ｻｶ莠ｺ蝨ｰ蝮�縲�';
-$messages['norecipientwarning'] = '閾ｳ蟆鷹怙隕∽ｸ�荳ｪ謾ｶ莉ｶ莠ｺ縲�';
+$messages['norecipientwarning'] = '閾ｳ蟆題ｾ灘�･荳�荳ｪ謾ｶ莉ｶ莠ｺ縲�';
 $messages['nosubjectwarning']  = '荳ｻ鬚倅ｸｺ遨ｺ縲よお隕∬ｾ灘�･荳�荳ｪ荳ｻ鬚伜雛�ｼ�';
-$messages['nobodywarning'] = '隕∝書騾∵裏豁｣譁�逧�驍ｮ莉ｶ蜷暦ｼ�';
+$messages['nobodywarning'] = '隕∝書騾∵ｲ｡譛画ｭ｣譁�逧�驍ｮ莉ｶ蜷暦ｼ�';
 $messages['notsentwarning'] = '驍ｮ莉ｶ譛ｪ蜿鷹�√�よお遑ｮ螳夊ｦ∫ｦｻ蠑�蟷ｶ闊榊ｼ�蠖灘燕驍ｮ莉ｶ蜷暦ｼ�';
-$messages['noldapserver'] = '隸ｷ騾画叫荳�荳ｪLDAP譛榊苅蝎ｨ霑幄｡梧衍謇ｾ縲�';
-$messages['nosearchname'] = '隸ｷ霎灘�･荳�荳ｪ閨皮ｳｻ莠ｺ蟋灘錐謌也鳩蟄宣ぐ莉ｶ蝨ｰ蝮�縲�';
-$messages['notuploadedwarning'] = '髯�莉ｶ霑俶ｲ｡譛牙�ｨ驛ｨ荳贋ｼ��ｼ瑚ｯｷ遲牙ｾ�謌冶��蜿匁ｶ井ｸ贋ｼ�縲�';
+$messages['noldapserver'] = '隸ｷ騾画叫荳�荳ｪ逕ｨ譚･譟･謇ｾ逧� LDAP 譛榊苅蝎ｨ縲�';
+$messages['nosearchname'] = '隸ｷ霎灘�･閨皮ｳｻ莠ｺ蟋灘錐謌也鳩蟄宣ぐ莉ｶ蝨ｰ蝮�縲�';
+$messages['notuploadedwarning'] = '髯�莉ｶ蟆壽悴蜈ｨ驛ｨ荳贋ｼ��ｼ瑚ｯｷ閠仙ｿ�遲牙ｾ�謌冶��蜿匁ｶ井ｸ贋ｼ�縲�';
 $messages['searchsuccessful'] = '蜈ｱ謇ｾ蛻ｰ $nr 蟆�驍ｮ莉ｶ縲�';
 $messages['contactsearchsuccessful'] = '蜈ｱ謇ｾ蛻ｰ $nr 菴崎＃邉ｻ莠ｺ縲�';
-$messages['searchnomatch'] = '譛ｪ謇ｾ蛻ｰ莉ｻ菴慕ｬｦ蜷域擅莉ｶ逧�驍ｮ莉ｶ';
+$messages['searchnomatch'] = '譛ｪ謇ｾ蛻ｰ莉ｻ菴慕ｬｦ蜷域擅莉ｶ逧�驍ｮ莉ｶ縲�';
 $messages['searching'] = '豁｣蝨ｨ謳懃ｴ｢...';
 $messages['checking'] = '豁｣蝨ｨ譽�譟･...';
-$messages['nospellerrors'] = '譛ｪ蜿醍鴫諡ｼ蜀咎漠隸ｯ';
-$messages['folderdeleted'] = '譁�莉ｶ螟ｹ蟾ｲ陲ｫ謌仙粥蛻�髯､縲�';
-$messages['foldersubscribed'] = '謌仙粥隶｢髦�譁�莉ｶ螟ｹ縲�';
-$messages['folderunsubscribed'] = '謌仙粥騾�隶｢逧�譁�莉ｶ螟ｹ縲�';
-$messages['folderpurged'] = '謌仙粥貂�遨ｺ譁�莉ｶ螟ｹ縲�';
+$messages['nospellerrors'] = '譛ｪ蜿醍鴫諡ｼ蜀咎漠隸ｯ縲�';
+$messages['folderdeleted'] = '蛻�髯､譁�莉ｶ螟ｹ謌仙粥縲�';
+$messages['foldersubscribed'] = '隶｢髦�譁�莉ｶ螟ｹ謌仙粥縲�';
+$messages['folderunsubscribed'] = '騾�隶｢譁�莉ｶ螟ｹ謌仙粥縲�';
+$messages['folderpurged'] = '貂�遨ｺ譁�莉ｶ螟ｹ謌仙粥縲�';
 $messages['folderexpunged'] = '譁�莉ｶ螟ｹ蟾ｲ貂�遨ｺ縲�';
 $messages['deletedsuccessfully'] = '蛻�髯､謌仙粥縲�';
 $messages['converting'] = '譬ｼ蠑剰ｽｬ謐｢荳ｭ...';
-$messages['messageopenerror'] = '譌�豕穂ｻ取恪蜉｡蝎ｨ荳雁刈霓ｽ驍ｮ莉ｶ蜀�螳ｹ縲�';
+$messages['messageopenerror'] = '譌�豕穂ｻ取恪蜉｡蝎ｨ蜉�霓ｽ驍ｮ莉ｶ蜀�螳ｹ縲�';
 $messages['fileuploaderror'] = '譁�莉ｶ荳贋ｼ�螟ｱ雍･縲�';
 $messages['filesizeerror'] = '荳贋ｼ�逧�譁�莉ｶ雜�霑�莠� $size 逧�螟ｧ蟆城剞蛻ｶ縲�';
 $messages['copysuccess'] = '謌仙粥螟榊宛 $nr 荳ｪ蝨ｰ蝮�縲�';
 $messages['copyerror'] = '譌�豕募､榊宛蝨ｰ蝮�縲�';
 $messages['sourceisreadonly'] = '貅仙慍蝮�荳ｺ蜿ｪ隸ｻ縲�';
-$messages['errorsavingcontact'] = '譌�豕穂ｿ晏ｭ倩＃邉ｻ莠ｺ逧�蝨ｰ蝮�縲�';
-$messages['movingmessage'] = '遘ｻ蜉ｨ驍ｮ莉ｶ蛻ｰ...';
-$messages['copyingmessage'] = '螟榊宛驍ｮ莉ｶ蛻ｰ...';
-$messages['copyingcontact'] = '螟榊宛閨皮ｳｻ莠ｺ...';
+$messages['errorsavingcontact'] = '譌�豕穂ｿ晏ｭ倩＃邉ｻ莠ｺ蝨ｰ蝮�縲�';
+$messages['movingmessage'] = '豁｣蝨ｨ遘ｻ蜉ｨ驍ｮ莉ｶ...';
+$messages['copyingmessage'] = '豁｣蝨ｨ螟榊宛驍ｮ莉ｶ...';
+$messages['copyingcontact'] = '豁｣蝨ｨ螟榊宛閨皮ｳｻ莠ｺ...';
 $messages['deletingmessage'] = '豁｣蝨ｨ蛻�髯､驍ｮ莉ｶ...';
 $messages['markingmessage'] = '豁｣蝨ｨ譬�隶ｰ驍ｮ莉ｶ...';
-$messages['addingmember'] = '豁｣蝨ｨ豺ｻ蜉�閨皮ｳｻ莠ｺ蛻ｰ扈�...';
-$messages['removingmember'] = '豁｣蝨ｨ莉守ｻ�荳ｭ蛻�髯､閨皮ｳｻ莠ｺ...';
-$messages['receiptsent'] = '謌仙粥蜿鷹�∽ｺ�荳�荳ｪ蟾ｲ隸ｻ蝗樊鴬縲�';
-$messages['errorsendingreceipt'] = '譌�豕募書騾∝屓謇ｧ縲�';
-$messages['deleteidentityconfirm'] = '謔ｨ逵溽噪諠ｳ蛻�髯､霑吩ｸｪ鬪瑚ｯ∽ｿ｡諱ｯ蜷暦ｼ�';
-$messages['nodeletelastidentity'] = '譌�豕募唖髯､霑吩ｸｪ霄ｫ莉ｽ�ｼ瑚ｿ呎弍譛�蜷惹ｸ�荳ｪ縲�';
-$messages['forbiddencharacter'] = '逶ｮ蠖募錐蛹�蜷ｫ髫占酪蟄礼ｬｦ縲�';
+$messages['addingmember'] = '豁｣蝨ｨ豺ｻ蜉�閨皮ｳｻ莠ｺ閾ｳ鄒､扈�...';
+$messages['removingmember'] = '豁｣蝨ｨ莉守ｾ､扈�荳ｭ蛻�髯､閨皮ｳｻ莠ｺ...';
+$messages['receiptsent'] = '謌仙粥蜿鷹�∽ｸ�荳ｪ蟾ｲ隸ｻ蝗樊鴬縲�';
+$messages['errorsendingreceipt'] = '譌�豕募書騾∝ｷｲ隸ｻ蝗樊鴬縲�';
+$messages['deleteidentityconfirm'] = '譏ｯ蜷ｦ蛻�髯､隸･霄ｫ莉ｽ�ｼ�';
+$messages['nodeletelastidentity'] = '譌�豕募唖髯､隸･霄ｫ莉ｽ�ｼ瑚ｿ呎弍譛�蜷惹ｸ�荳ｪ縲�';
+$messages['forbiddencharacter'] = '逶ｮ蠖募錐蛹�蜷ｫ遖∵ｭ｢蟄礼ｬｦ縲�';
 $messages['selectimportfile'] = '隸ｷ騾画叫隕∽ｸ贋ｼ�逧�譁�莉ｶ縲�';
-$messages['addresswriterror'] = '蟾ｲ騾画叫逧�蝨ｰ蝮�邁ｿ荳榊庄蜀吶��';
-$messages['contactaddedtogroup'] = '謌仙粥豺ｻ蜉�閨皮ｳｻ莠ｺ閾ｳ隸･蛻�扈�縲�';
-$messages['contactremovedfromgroup'] = '謌仙粥莉手ｯ･蛻�扈�遘ｻ髯､閨皮ｳｻ莠ｺ縲�';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['addresswriterror'] = '騾我ｸｭ逧�騾夊ｮｯ蠖穂ｸ榊庄蜀吶��';
+$messages['contactaddedtogroup'] = '豺ｻ蜉�閨皮ｳｻ莠ｺ閾ｳ隸･鄒､扈�謌仙粥縲�';
+$messages['contactremovedfromgroup'] = '莉手ｯ･鄒､扈�遘ｻ髯､閨皮ｳｻ莠ｺ謌仙粥縲�';
+$messages['nogroupassignmentschanged'] = '鄒､扈�襍�譁呎ｲ｡譛牙序譖ｴ縲�';
 $messages['importwait'] = '豁｣蝨ｨ蟇ｼ蜈･�ｼ瑚ｯｷ遞榊錘...';
 $messages['importformaterror'] = '蟇ｼ蜈･螟ｱ雍･�ｼ∵枚莉ｶ譌�謨医��';
 $messages['importconfirm'] = '<b>謌仙粥蟇ｼ蜈･ $inserted 閨皮ｳｻ莠ｺ</b>';
 $messages['importconfirmskipped'] = '<b>霍ｳ霑�蟾ｲ蟄伜惠逧� $skipped 鬘ｹ逶ｮ</b>';
 $messages['opnotpermitted'] = '荳榊�∬ｮｸ逧�謫堺ｽ�!';
-$messages['nofromaddress'] = '騾我ｸｭ逧�霄ｫ莉ｽ荳ｭ豐｡譛蛾ぐ莉ｶ蝨ｰ蝮�縲�';
-$messages['editorwarning'] = '蛻�謐｢蛻ｰ郤ｯ譁�譛ｬ郛冶ｾ大勣蟆�蟇ｼ閾ｴ驍ｮ莉ｶ豁｣譁�荳ｭ逧�謇�譛画枚譛ｬ譬ｼ蠑丞､ｱ謨茨ｼ梧お遑ｮ螳夊ｦ∬ｿ呎�ｷ蛛壼雛�ｼ�';
-$messages['httpreceivedencrypterror'] = '蜿醍函莠�荳�荳ｪ閾ｴ蜻ｽ逧�驟咲ｽｮ髞呵ｯｯ�ｼ瑚ｯｷ遶句叉閨皮ｳｻ邂｡逅�蜻倥��<b>謔ｨ逧�驍ｮ莉ｶ譌�豕募書騾√��</b>';
+$messages['nofromaddress'] = '騾我ｸｭ逧�霄ｫ莉ｽ豐｡譛蛾ぐ莉ｶ蝨ｰ蝮�縲�';
+$messages['editorwarning'] = '蛻�謐｢閾ｳ郤ｯ譁�譛ｬ郛冶ｾ大勣蟆�蟇ｼ閾ｴ驍ｮ莉ｶ豁｣譁�荳ｭ逧�謇�譛画枚譛ｬ譬ｼ蠑丞､ｱ謨茨ｼ梧お遑ｮ螳夊ｦ∬ｿ呎�ｷ蛛壼雛�ｼ�';
+$messages['httpreceivedencrypterror'] = '<b>謔ｨ逧�驍ｮ莉ｶ譌�豕募書騾�</b>�ｼ悟屏荳ｺ蜿醍函莠�荳�荳ｪ荳･驥咲噪驟咲ｽｮ髞呵ｯｯ�ｼ瑚ｯｷ遶句叉閨皮ｳｻ邂｡逅�蜻倥��';
 $messages['smtpconnerror'] = 'SMTP 髞呵ｯｯ ($code):霑樊磁譛榊苅蝎ｨ螟ｱ雍･縲�';
 $messages['smtpautherror'] = 'SMTP 髞呵ｯｯ ($code): 隶､隸∝､ｱ雍･縲�';
 $messages['smtpfromerror'] = 'SMTP 髞呵ｯｯ ($code):豺ｻ蜉�蜿台ｻｶ莠ｺ螟ｱ雍･ "$from" ($msg)縲�';
@@ -137,17 +139,17 @@ $messages['smtperror'] = 'SMTP 髞呵ｯｯ: $msg';
 $messages['emailformaterror'] = '譌�謨育噪驍ｮ莉ｶ蝨ｰ蝮��ｼ�$email';
 $messages['toomanyrecipients'] = '謾ｶ莉ｶ莠ｺ螟ｪ螟夲ｼ瑚ｯｷ蜃丞ｰ台ｺｺ謨ｰ閾ｳ $max縲�';
 $messages['maxgroupmembersreached'] = '扈�蜻俶焚驥剰ｶ�霑�譛�螟ｧ蛟ｼ $max縲�';
-$messages['internalerror'] = '驕�蛻ｰ荳�荳ｪ蜀�驛ｨ髞呵ｯｯ�ｼ瑚ｯｷ驥崎ｯ輔��';
+$messages['internalerror'] = '蜿醍函荳�荳ｪ蜀�驛ｨ髞呵ｯｯ�ｼ瑚ｯｷ驥崎ｯ輔��';
 $messages['contactdelerror'] = '譌�豕募唖髯､閨皮ｳｻ莠ｺ縲�';
 $messages['contactdeleted'] = '蛻�髯､閨皮ｳｻ莠ｺ謌仙粥縲�';
 $messages['contactrestoreerror'] = '譌�豕墓△螟榊ｷｲ蛻�髯､逧�閨皮ｳｻ莠ｺ縲�';
 $messages['contactrestored'] = '閨皮ｳｻ莠ｺ諱｢螟肴�仙粥縲�';
-$messages['groupdeleted'] = '謌仙粥蛻�髯､扈�縲�';
-$messages['grouprenamed'] = '扈�謾ｹ蜷肴�仙粥縲�';
-$messages['groupcreated'] = '謌仙粥蛻帛ｻｺ扈�';
+$messages['groupdeleted'] = '蛻�髯､鄒､扈�謌仙粥縲�';
+$messages['grouprenamed'] = '鄒､扈�謾ｹ蜷肴�仙粥縲�';
+$messages['groupcreated'] = '謌仙粥蛻帛ｻｺ鄒､扈�';
 $messages['savedsearchdeleted'] = '謌仙粥蛻�髯､菫晏ｭ倡噪謳懃ｴ｢';
 $messages['savedsearchdeleteerror'] = '譌�豕募唖髯､菫晏ｭ倡噪謳懃ｴ｢';
-$messages['savedsearchcreated'] = '謌仙粥蟒ｺ遶倶ｿ晏ｭ倡噪謳懃ｴ｢';
+$messages['savedsearchcreated'] = '謌仙粥蛻帛ｻｺ菫晏ｭ倡噪謳懃ｴ｢';
 $messages['savedsearchcreateerror'] = '譌�豕募�帛ｻｺ菫晏ｭ倡噪謳懃ｴ｢縲�';
 $messages['messagedeleted'] = '蛻�髯､驍ｮ莉ｶ謌仙粥縲�';
 $messages['messagemoved'] = '遘ｻ蜉ｨ驍ｮ莉ｶ謌仙粥縲�';
@@ -161,9 +163,9 @@ $messages['folderupdated'] = '謌仙粥譖ｴ譁ｰ譁�莉ｶ螟ｹ';
 $messages['foldercreated'] = '謌仙粥蛻帛ｻｺ譁�莉ｶ螟ｹ';
 $messages['invalidimageformat'] = '髱樊ｳ慕噪蝗ｾ蜒冗ｱｻ蝙九��';
 $messages['mispellingsfound'] = '譽�譟･蛻ｰ諡ｼ蜀咎漠隸ｯ縲�';
-$messages['parentnotwritable'] = '譌�豕募�帛ｻｺ蜥瑚ｽｬ遘ｻ蛻ｰ謇�騾臥噪逶ｮ蠖�,譚�髯蝉ｸ崎ｶｳ縲�';
-$messages['messagetoobig'] = '逕ｱ莠朱ぐ莉ｶ驛ｨ蛻�霑�螟ｧ譌�豕募､�逅�縲�';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['parentnotwritable'] = '譌�豕募�帛ｻｺ/霓ｬ遘ｻ譁�莉ｶ螟ｹ閾ｳ謖�螳夂噪荳顔ｺｧ逶ｮ蠖�,譚�髯蝉ｸ崎ｶｳ縲�';
+$messages['messagetoobig'] = '驍ｮ莉ｶ霑�螟ｧ譌�豕募､�逅�縲�';
+$messages['attachmentvalidationerror'] = '隴ｦ蜻奇ｼ∬ｯ･髯�莉ｶ蠕亥庄逍托ｼ悟屏荳ｺ蜈ｶ閾ｪ霄ｫ逧�譬ｼ蠑丈ｸ朱ぐ莉ｶ荳ｭ螢ｰ譏守噪譬ｼ蠑丈ｸ咲ｬｦ縲ょｦよ棡謔ｨ荳堺ｿ｡莉ｻ蜿鷹�∽ｺｺ�ｼ悟�吩ｸ榊ｺ碑ｯ･蝨ｨ豬剰ｧ亥勣荳ｭ謇灘ｼ�隸･髯�莉ｶ縲�<br/><br/><em>螢ｰ譏取�ｼ蠑擾ｼ�$expected�ｼ帛ｮ樣刔譬ｼ蠑擾ｼ�$detected</em>';
 $messages['noscriptwarning'] = '隴ｦ蜻奇ｼ壽悽遞句ｺ城怙隕� Javascript 謾ｯ謖��ｼ∬ｯｷ蝨ｨ豬剰ｧ亥勣隶ｾ鄂ｮ荳ｭ蜷ｯ逕ｨ Javascript縲�';
 
 ?>
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 6f2f7ed52..a545f2f81 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '隍�陬ｽ';
 $labels['move']     = '遘ｻ蜍�';
 $labels['moveto']   = '遘ｻ閾ｳ...';
 $labels['download'] = '荳玖ｼ�';
+$labels['open']     = 'Open';
 $labels['showattachment'] = '鬘ｯ遉ｺ';
 $labels['showanyway'] = '邵ｽ譏ｯ鬘ｯ遉ｺ';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '逶ｮ蜑埼��髱｢';
 $labels['unread'] = '譛ｪ隶�蜿也噪驛ｵ莉ｶ';
 $labels['flagged'] = '蟾ｲ蜉�讓呵ｨ倡噪驛ｵ莉ｶ';
 $labels['unanswered'] = '譛ｪ蝗櫁ｦ�逧�驛ｵ莉ｶ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '蟾ｲ蛻ｪ髯､逧�驛ｵ莉ｶ';
 $labels['undeleted'] = '譛ｪ蛻ｪ髯､逧�驛ｵ莉ｶ';
 $labels['invert'] = '蜿埼∈';
@@ -204,6 +206,8 @@ $labels['body']  = '蜈ｧ譁�';
 
 $labels['openinextwin'] = '蝨ｨ譁ｰ隕也ｪ鈴幕蝠�';
 $labels['emlsave'] = '荳玖ｼ会ｼ�.eml�ｼ�';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '莉･譁ｰ驛ｵ莉ｶ邱ｨ霈ｯ';
@@ -241,7 +245,7 @@ $labels['nosubject']  = '�ｼ域ｲ呈怏荳ｻ譌ｨ�ｼ�';
 $labels['showimages'] = '鬘ｯ遉ｺ蝨也援';
 $labels['alwaysshow'] = '豌ｸ驕�鬘ｯ遉ｺ萓�閾ｪ $sender 逧�蝨也援';
 $labels['isdraft']    = '騾呎弍荳�蟆∬拷遞ｿ';
-$labels['andnmore']   = '$nr more...';
+$labels['andnmore']   = '隨ｬ$nr蟆∵�匁弍譖ｴ螟�...';
 $labels['togglemoreheaders'] = '鬘ｯ遉ｺ譖ｴ螟夂噪險頑�ｯ陦ｨ鬆ｭ';
 $labels['togglefullheaders'] = '蛻�謠帛次蟋玖ｨ頑�ｯ陦ｨ鬆ｭ';
 
@@ -335,8 +339,8 @@ $labels['composeto']      = '蟇�菫｡閾ｳ謇�驕ｸ謫�逧�閨ｯ邨｡莠ｺ';
 $labels['contactsfromto'] = '閨ｯ邨｡莠ｺ $from 閾ｳ $to�ｼ悟�ｱ譛� $count 莠ｺ';
 $labels['print']          = '蛻怜魂';
 $labels['export']         = '蛹ｯ蜃ｺ騾夊ｨ企隙';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = '蛹ｯ蜃ｺ蜈ｨ驛ｨ';
+$labels['exportsel']      = '蛹ｯ蜃ｺ驕ｸ謫�鬆�逶ｮ';
 $labels['exportvcards']   = '蛹ｯ蜃ｺ騾夊ｨ企隙轤ｺ vCard 譬ｼ蠑�';
 $labels['newcontactgroup'] = '譁ｰ蠅櫁�ｯ邨｡莠ｺ鄒､邨�';
 $labels['grouprename']    = '驥肴眠蜻ｽ蜷咲ｾ､邨�';
@@ -380,7 +384,7 @@ $labels['edititem'] = '邱ｨ霈ｯ鬆�逶ｮ';
 $labels['preferhtml'] = '菴ｿ逕ｨ HTML 鬘ｯ遉ｺ';
 $labels['defaultcharset'] = '鬆占ｨｭ邱ｨ遒ｼ';
 $labels['htmlmessage'] = 'HTML 驛ｵ莉ｶ';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = '驛ｨ蛻�';
 $labels['digitalsig'] = '謨ｸ菴咲ｰｽ遶�';
 $labels['dateformat'] = '譌･譛滓�ｼ蠑�';
 $labels['timeformat'] = '譎る俣譬ｼ蠑�';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '菴ｿ逕ｨ HTML 謦ｰ蟇ｫ驛ｵ莉ｶ';
 $labels['htmlonreply'] = '蜿ｪ譛牙惠蝗櫁ｦ�HTML菫｡莉ｶ譎�';
 $labels['htmlonreplyandforward'] = '蜿ｪ譛牙惠霓牙ｯ�謌門屓隕�HTML菫｡莉ｶ譎�';
 $labels['htmlsignature'] = 'HTML 邁ｽ蜷肴ｪ�';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '鬘ｯ遉ｺ鬆占ｦｽ遯玲�ｼ';
 $labels['skin'] = '迚磯擇鬚ｨ譬ｼ';
 $labels['logoutclear'] = '逋ｻ蜃ｺ譎よｸ�遨ｺ蝙�蝨ｾ譯ｶ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '蝗櫁ｦ�譎らｧｻ髯､蜴滓怏邁ｽ蜷肴ｪ�';
 $labels['autoaddsignature'] = '閾ｪ蜍暮刋蜉�邁ｽ蜷�';
 $labels['newmessageonly'] = '蜿ｪ譛画眠險頑�ｯ';
 $labels['replyandforwardonly'] = '蜿ｪ譛牙屓隕�謌冶ｽ牙ｯ�';
-$labels['replysignaturepos'] = '逡ｶ蝗櫁ｦ�謌冶ｽ牙ｯ�譎る刋荳顔ｰｽ蜷肴ｪ�';
-$labels['belowquote'] = '蠑慕畑逧�荳区婿';
-$labels['abovequote'] = '蠑慕畑逧�荳頑婿';
 $labels['insertsignature'] = '謠貞�･邁ｽ蜷肴ｪ�';
 $labels['previewpanemarkread']  = '讓咏､ｺ蟾ｲ鬆占ｦｽ險頑�ｯ轤ｺ蟾ｲ隶�蜿�';
 $labels['afternseconds']  = '$n 遘剃ｹ句ｾ�';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index f0f92c848..5605ba815 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '雉�譁吝ｺｫ骭ｯ隱､!';
 $messages['requesttimedout'] = '隕∵ｱる�ｾ譎�';
 $messages['errorreadonly'] = '蜍穂ｽ懃┌豕募ｮ梧�舌�りｳ�譁吝､ｾ蜚ｯ隶�';
 $messages['errornoperm'] = '蜍穂ｽ懃┌豕募ｮ梧�舌�よｬ企剞荳咲ｬｦ';
+$messages['erroroverquota'] = '蜍穂ｽ懃┌豕募ｮ梧�舌�ら｡ｬ遒溽ｩｺ髢謎ｸ榊､�';
+$messages['erroroverquotadelete'] = '遑ｬ遒溽ｩｺ髢謎ｸ榊､�,隲倶ｽｿ逕ｨSHIFT+DEL萓�蛻ｪ髯､險頑�ｯ';
 $messages['invalidrequest'] = '隕∵ｱら┌謨茨ｼ∵悴蜆ｲ蟄倅ｻｻ菴戊ｳ�譁吶��';
 $messages['invalidhost'] = '辟｡謨育噪莨ｺ譛榊勣蜷咲ｨｱ';
 $messages['nomessagesfound'] = '豁､驛ｵ莉ｶ蛹｣豐呈怏莉ｻ菴暮Ψ莉ｶ';