diff --git a/locale/mail.de.tr b/locale/mail.de.tr
index 1307082..12c053d 100644
--- a/locale/mail.de.tr
+++ b/locale/mail.de.tr
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=
 Communication using this system is NOT guaranteed to be private!=
 Admins are able to view the messages of any player.=
 Contributors=
+Settings=
+About=Über
 You have a new message from @1! Subject: @2=
 To view it, type /mail=
 You could also use the button in your inventory.=
@@ -13,18 +15,9 @@ BCC=BCC
 Cancel=Abbrechen
 Save draft=Entwurf Speichern
 Send=Senden
+Name=Name
 No drafts=Keine Entwürfe
-Player name=Spielername
-That name is already in your contacts=
-The contact name cannot be empty.=
-Maillist name=Verteilerlistenname
-Desc=Beschreibung
-Players=Spieler
-That name is already in your mailing lists.=
-The mailing list name cannot be empty.=
-Back=Zurück
-Mark Read=Als gelesen makieren
-Mark Unread=Als ungelesen makieren
+Edit=Bearbeiten
 Trash=
 Inbox=Posteingang
 Outbox=Senden
@@ -34,29 +27,42 @@ Mail lists=Verteilerlisten
 Options=
 Close=Schließen
 (No subject)=(Kein Betreff)
+Player name=Spielername
+That name is already in your contacts=
+The contact name cannot be empty.=
+Maillist name=Verteilerlistenname
+Desc=Beschreibung
+Players=Spieler
+That name is already in your mailing lists.=
+The mailing list name cannot be empty.=
+Save=Speichern
+Mark Read=Als gelesen makieren
+Mark Unread=Als ungelesen makieren
+New=Neu
+(No description)=(Keine Beschreibung)
+No maillist=Keine Verteilerliste
 From=Von
-Reply=Antworten
-Reply all=Allen antworten
-Forward=Weiter
+Delete=Löschen
+Subject=Betreff
+CC=CC
+To=An
+You have mail! Type /mail to read=
 Filter=
 Allow multiple selection=
 @1 of @2 selected=
 (Un)select all=
 No mail=Keine Nachrichten
+Date=Datum
+Ascending=
+Descending=
 Read=Lesen
-(No description)=(Keine Beschreibung)
-No maillist=Keine Verteilerliste
-Note=Notiz
-Edit=Bearbeiten
-New=Neu
-Delete=Löschen
-You have mail! Type /mail to read=
-Subject=Betreff
-To=An
+Reply=Antworten
+Reply all=Allen antworten
+Forward=Weiter
 Add=Hinzufügen
 Remove=Entfernen
-Name=Name
-CC=CC
+Note=Notiz
+Back=Zurück
 Notifications=
 Chat notifications=
 On join notifications=
@@ -69,12 +75,7 @@ Default sorting fields=
 Other=
 Move deleted messages to trash=
 Reset=
-Settings=
-About=Über
-Save=Speichern
-Ascending=
-Descending=
-Date=Datum
 From/To=Von/An
 Restore=
+Empty=
 Trash is empty=
diff --git a/locale/mail.es.tr b/locale/mail.es.tr
index ae577ed..781ec75 100644
--- a/locale/mail.es.tr
+++ b/locale/mail.es.tr
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=
 Communication using this system is NOT guaranteed to be private!=
 Admins are able to view the messages of any player.=
 Contributors=
+Settings=
+About=Acerca de
 You have a new message from @1! Subject: @2=
 To view it, type /mail=
 You could also use the button in your inventory.=
@@ -13,18 +15,9 @@ BCC=CCO
 Cancel=Cancelar
 Save draft=Guardar borrador
 Send=Enviar
+Name=Nombre
 No drafts=No hay borradores
-Player name=Nombre del jugador
-That name is already in your contacts=Ese nombre ya está en tus contactos
-The contact name cannot be empty.=Ese nombre de contacto no puede estar vacío.
-Maillist name=Nombre de la lista de correo
-Desc=Desc
-Players=Jugadores
-That name is already in your mailing lists.=Ese nombre ya está entus listas de correo.
-The mailing list name cannot be empty.=Ese nombre de lista de correo no puede estar vacío.
-Back=Volver
-Mark Read=Marcar como leído
-Mark Unread=Marcar como no leído
+Edit=Editar
 Trash=
 Inbox=Entrada
 Outbox=Enviados
@@ -34,29 +27,42 @@ Mail lists=Listas de correo
 Options=
 Close=Cerrar
 (No subject)=(Sin asunto)
+Player name=Nombre del jugador
+That name is already in your contacts=Ese nombre ya está en tus contactos
+The contact name cannot be empty.=Ese nombre de contacto no puede estar vacío.
+Maillist name=Nombre de la lista de correo
+Desc=Desc
+Players=Jugadores
+That name is already in your mailing lists.=Ese nombre ya está entus listas de correo.
+The mailing list name cannot be empty.=Ese nombre de lista de correo no puede estar vacío.
+Save=Guardar
+Mark Read=Marcar como leído
+Mark Unread=Marcar como no leído
+New=Nuevo
+(No description)=(Sin descripción)
+No maillist=Sin lista de correo
 From=De
-Reply=Responder
-Reply all=Responder a todos
-Forward=Reenviar
+Delete=Borrar
+Subject=Asunto
+CC=CC
+To=Para
+You have mail! Type /mail to read=
 Filter=Filtrar
 Allow multiple selection=Permitir selección múltiple
 @1 of @2 selected=
 (Un)select all=(Des)seleccionar todos
 No mail=Sin correo
+Date=Fecha
+Ascending=Ascendente
+Descending=Descendiente
 Read=Leído
-(No description)=(Sin descripción)
-No maillist=Sin lista de correo
-Note=Nota
-Edit=Editar
-New=Nuevo
-Delete=Borrar
-You have mail! Type /mail to read=
-Subject=Asunto
-To=Para
+Reply=Responder
+Reply all=Responder a todos
+Forward=Reenviar
 Add=Añadir
 Remove=Quitar
-Name=Nombre
-CC=CC
+Note=Nota
+Back=Volver
 Notifications=
 Chat notifications=
 On join notifications=
@@ -69,17 +75,7 @@ Default sorting fields=
 Other=
 Move deleted messages to trash=
 Reset=
-Settings=
-About=Acerca de
-Save=Guardar
-Ascending=Ascendente
-Descending=Descendiente
-Date=Fecha
 From/To=De/Para
 Restore=
+Empty=
 Trash is empty=
-
-
-##### not used anymore #####
-
-@1 selected=@1 seleccionado
diff --git a/locale/mail.fr.tr b/locale/mail.fr.tr
index 260832e..d90a6c8 100644
--- a/locale/mail.fr.tr
+++ b/locale/mail.fr.tr
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=Expat (code), WTFPL (textures)
 Communication using this system is NOT guaranteed to be private!=La communication par ce système n'est pas garantie d'être privée !
 Admins are able to view the messages of any player.=Les administrateurs peuvent voir les messages de chaque joueur.
 Contributors=Contributeurs
+Settings=Paramètres
+About=À propos
 You have a new message from @1! Subject: @2=Vous avez un nouveau message de @1 ! Objet : @2
 To view it, type /mail=Pour le consulter, entrez /mail
 You could also use the button in your inventory.=Vous pouvez également utiliser le bouton dans votre inventaire
@@ -13,18 +15,9 @@ BCC=Cci
 Cancel=Annuler
 Save draft=Enregistrer le brouillon
 Send=Envoyer
+Name=Nom
 No drafts=Pas de brouillons
-Player name=Nom du joueur
-That name is already in your contacts=Ce nom est déjà dans vos contacts
-The contact name cannot be empty.=Le nom du contact ne peut pas être vide.
-Maillist name=Nom de la liste de diffusion
-Desc=Desc
-Players=Joueurs
-That name is already in your mailing lists.=Ce nom est déjà dans vos listes de diffusion.
-The mailing list name cannot be empty.=Le nom de la liste de diffusion ne peut pas être vide.
-Back=Retour
-Mark Read=Marquer comme lu
-Mark Unread=Marquer non lu
+Edit=Modifier
 Trash=Corbeille
 Inbox=Boîte de réception
 Outbox=Envoyés
@@ -34,29 +27,42 @@ Mail lists=Listes de diffusion
 Options=Options
 Close=Fermer
 (No subject)=(Sans objet)
+Player name=Nom du joueur
+That name is already in your contacts=Ce nom est déjà dans vos contacts
+The contact name cannot be empty.=Le nom du contact ne peut pas être vide.
+Maillist name=Nom de la liste de diffusion
+Desc=Desc
+Players=Joueurs
+That name is already in your mailing lists.=Ce nom est déjà dans vos listes de diffusion.
+The mailing list name cannot be empty.=Le nom de la liste de diffusion ne peut pas être vide.
+Save=Sauvegarder
+Mark Read=Marquer comme lu
+Mark Unread=Marquer non lu
+New=Nouveau
+(No description)=Sans description
+No maillist=Aucune liste de diffusion
 From=De
-Reply=Répondre
-Reply all=Répondre à tous
-Forward=Transférer
+Delete=Supprimer
+Subject=Objet
+CC=Cc
+To=À
+You have mail! Type /mail to read=Vous avez reçu un mail ! Entrez /mail pour le consulter
 Filter=Filtre
 Allow multiple selection=Autoriser la sélection multiple
 @1 of @2 selected=@1 sur @2 sélectionnés
 (Un)select all=Tout (dé)selectionner
 No mail=Aucun mail
+Date=Date
+Ascending=Croissant
+Descending=Décroissant
 Read=Lire
-(No description)=Sans description
-No maillist=Aucune liste de diffusion
-Note=Note
-Edit=Modifier
-New=Nouveau
-Delete=Supprimer
-You have mail! Type /mail to read=Vous avez reçu un mail ! Entrez /mail pour le consulter
-Subject=Objet
-To=À
+Reply=Répondre
+Reply all=Répondre à tous
+Forward=Transférer
 Add=Ajouter
 Remove=Enlever
-Name=Nom
-CC=Cc
+Note=Note
+Back=Retour
 Notifications=Notifications
 Chat notifications=Notifications dans le tchat
 On join notifications=Notifications à la connexion
@@ -69,12 +75,7 @@ Default sorting fields=Champs de tri par défaut
 Other=Autre
 Move deleted messages to trash=Supprimer les messages dans la corbeille
 Reset=Réinitialiser
-Settings=Paramètres
-About=À propos
-Save=Sauvegarder
-Ascending=Croissant
-Descending=Décroissant
-Date=Date
 From/To=De/À
 Restore=Restaurer
+Empty=Vider
 Trash is empty=La corbeille est vide
diff --git a/locale/mail.hu.tr b/locale/mail.hu.tr
index 8fbafbd..3d01387 100644
--- a/locale/mail.hu.tr
+++ b/locale/mail.hu.tr
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=Expat (kód), WTFPL (textúrák)
 Communication using this system is NOT guaranteed to be private!=A systemben lévő komunikáció nem garantáltan privát!
 Admins are able to view the messages of any player.=Az adminok megtudják nézni minden játékos üzenetjét.
 Contributors=Közreműködöttek
+Settings=Beállítások
+About=Róla
 You have a new message from @1! Subject: @2=Van egy új üzeneted @1-től Cím: @2
 To view it, type /mail=Ahhoz hogy megnézd, írd /mail
 You could also use the button in your inventory.=A gombot is tudod használni az inventoridban.
@@ -13,18 +15,9 @@ BCC=BCC
 Cancel=Mégse
 Save draft=mentés piszkozatként
 Send=Küldés
+Name=Név
 No drafts=Nincsenek piszkozatok
-Player name=Játékos neve
-That name is already in your contacts=A név már a kontaktok között van
-The contact name cannot be empty.=A contakt neve nem lehet üres.
-Maillist name=Levelező lista neve
-Desc=Desc
-Players=Játékosok
-That name is already in your mailing lists.=A név már benne van a levelező listában
-The mailing list name cannot be empty.=A levelező lista neve nem lehet üres
-Back=Visza
-Mark Read=Jelöld olvasottként
-Mark Unread=Jelöld olvasatlanul
+Edit=Szerkesztés
 Trash=
 Inbox=PostaLáda
 Outbox=Elküldött
@@ -34,29 +27,42 @@ Mail lists=Levelező lista
 Options=Lehetőségek
 Close=Bezár
 (No subject)=(nincs cím)
+Player name=Játékos neve
+That name is already in your contacts=A név már a kontaktok között van
+The contact name cannot be empty.=A contakt neve nem lehet üres.
+Maillist name=Levelező lista neve
+Desc=Desc
+Players=Játékosok
+That name is already in your mailing lists.=A név már benne van a levelező listában
+The mailing list name cannot be empty.=A levelező lista neve nem lehet üres
+Save=Mentés
+Mark Read=Jelöld olvasottként
+Mark Unread=Jelöld olvasatlanul
+New=Új
+(No description)=(Nincs leírás)
+No maillist=Nincs levelező lista
 From=Tőle
-Reply=Válasz
-Reply all=Válaszmindenkinek
-Forward=Továbbítás
+Delete=Törlés
+Subject=Cím
+CC=CC
+To=Neki
+You have mail! Type /mail to read=Van egy leveled! Írd /mail az olvasáshoz
 Filter=Filterek
 Allow multiple selection=
 @1 of @2 selected=
 (Un)select all=(ne válaszd ki) mindegyik választása
 No mail=Nincs levél
+Date=Dátum
+Ascending=Emelkedő
+Descending=Sűlyedő
 Read=Olvasott
-(No description)=(Nincs leírás)
-No maillist=Nincs levelező lista
-Note=Jegyzet
-Edit=Szerkesztés
-New=Új
-Delete=Törlés
-You have mail! Type /mail to read=Van egy leveled! Írd /mail az olvasáshoz
-Subject=Cím
-To=Neki
+Reply=Válasz
+Reply all=Válaszmindenkinek
+Forward=Továbbítás
 Add=Hozzáadás
 Remove=Elvétel
-Name=Név
-CC=CC
+Note=Jegyzet
+Back=Visza
 Notifications=Értesítések
 Chat notifications=Chates értesítések
 On join notifications=Belépési értesírés
@@ -69,12 +75,7 @@ Default sorting fields=Alap válogató terület
 Other=
 Move deleted messages to trash=
 Reset=Viszaállítás
-Settings=Beállítások
-About=Róla
-Save=Mentés
-Ascending=Emelkedő
-Descending=Sűlyedő
-Date=Dátum
 From/To=Tól(től)/neki
 Restore=
+Empty=
 Trash is empty=
diff --git a/locale/mail.pt_BR.tr b/locale/mail.pt_BR.tr
index 3da08da..8c8219e 100644
--- a/locale/mail.pt_BR.tr
+++ b/locale/mail.pt_BR.tr
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=
 Communication using this system is NOT guaranteed to be private!=A comunicação usando este sistema não possui garantia de privacidade
 Admins are able to view the messages of any player.=Administradores poderão ler as mensagens de qualquer jogador
 Contributors=
+Settings=Ajustes
+About=Sobre
 You have a new message from @1! Subject: @2=Você tem uma mensagem de @1! Assunto: @2
 To view it, type /mail=Para visualizar a mensagem, digite /mail
 You could also use the button in your inventory.=Você também pode usar o botão do seu inventário.
@@ -13,18 +15,9 @@ BCC=BCC
 Cancel=Cancelar
 Save draft=Salvar rascunho
 Send=Enviar
+Name=Nome
 No drafts=Sem rascunhos
-Player name=Nome do jogador
-That name is already in your contacts=Esse nome já consta em sua lista de contatos
-The contact name cannot be empty.=Informe o nome do destinatário
-Maillist name=Nome da lista de discussão
-Desc=Descrição
-Players=Jogador
-That name is already in your mailing lists.=Esse nome ja está sendo usado em sua lista de discussões
-The mailing list name cannot be empty.=O nome da lista de discussões deve ser informado
-Back=Voltar
-Mark Read=Marcar como lido
-Mark Unread=Marcar como não lido
+Edit=Editar
 Trash=
 Inbox=Entrada
 Outbox=Enviadas
@@ -34,29 +27,42 @@ Mail lists=Lista de correios
 Options=Opções
 Close=Fechar
 (No subject)=(Sem assunto)
+Player name=Nome do jogador
+That name is already in your contacts=Esse nome já consta em sua lista de contatos
+The contact name cannot be empty.=Informe o nome do destinatário
+Maillist name=Nome da lista de discussão
+Desc=Descrição
+Players=Jogador
+That name is already in your mailing lists.=Esse nome ja está sendo usado em sua lista de discussões
+The mailing list name cannot be empty.=O nome da lista de discussões deve ser informado
+Save=Salvar
+Mark Read=Marcar como lido
+Mark Unread=Marcar como não lido
+New=Novo
+(No description)=(sem descrição)
+No maillist=Sem lista de discussão
 From=De
-Reply=Responder
-Reply all=Responder Todos
-Forward=Encaminhar
+Delete=Apagar
+Subject=Assunto
+CC=CC
+To=Para
+You have mail! Type /mail to read=Você recebeu e-mail! Tecle /mail para ler
 Filter=Filtrar
 Allow multiple selection=Permitir selecionar vários
 @1 of @2 selected=
 (Un)select all=Desmarcar todos
 No mail=Sem e-mails no momento
+Date=Data
+Ascending=Ascendente
+Descending=Descendente
 Read=Ler
-(No description)=(sem descrição)
-No maillist=Sem lista de discussão
-Note=Nota
-Edit=Editar
-New=Novo
-Delete=Apagar
-You have mail! Type /mail to read=Você recebeu e-mail! Tecle /mail para ler
-Subject=Assunto
-To=Para
+Reply=Responder
+Reply all=Responder Todos
+Forward=Encaminhar
 Add=Adicionar
 Remove=Remover
-Name=Nome
-CC=CC
+Note=Nota
+Back=Voltar
 Notifications=Notificações
 Chat notifications=Notificação de conversa
 On join notifications=Notificação ao entrar
@@ -69,17 +75,7 @@ Default sorting fields=Ordenamento de campos padrão
 Other=
 Move deleted messages to trash=
 Reset=
-Settings=Ajustes
-About=Sobre
-Save=Salvar
-Ascending=Ascendente
-Descending=Descendente
-Date=Data
 From/To=De/Para
 Restore=
+Empty=
 Trash is empty=
-
-
-##### not used anymore #####
-
-@1 selected=@1 selecionado
diff --git a/locale/mail.zh_CN.tr b/locale/mail.zh_CN.tr
index db15bee..2933e22 100644
--- a/locale/mail.zh_CN.tr
+++ b/locale/mail.zh_CN.tr
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=
 Communication using this system is NOT guaranteed to be private!=
 Admins are able to view the messages of any player.=
 Contributors=
+Settings=
+About=关于
 You have a new message from @1! Subject: @2=
 To view it, type /mail=
 You could also use the button in your inventory.=
@@ -13,19 +15,10 @@ BCC=密送
 Cancel=取消
 Save draft=保存草稿
 Send=发送
+Name=名字
 #if new means new mail, it would be New=新邮件
 No drafts=没有草稿
-Player name=玩家名字
-That name is already in your contacts=
-The contact name cannot be empty.=
-Maillist name=建组名
-Desc=描述
-Players=玩家
-That name is already in your mailing lists.=
-The mailing list name cannot be empty.=
-Back=返回
-Mark Read=标记为已读
-Mark Unread=标记为未读
+Edit=编辑
 Trash=
 Inbox=收件箱
 Outbox=已发送
@@ -35,29 +28,42 @@ Mail lists=建组
 Options=
 Close=关闭
 (No subject)=(无主题)
+Player name=玩家名字
+That name is already in your contacts=
+The contact name cannot be empty.=
+Maillist name=建组名
+Desc=描述
+Players=玩家
+That name is already in your mailing lists.=
+The mailing list name cannot be empty.=
+Save=保存
+Mark Read=标记为已读
+Mark Unread=标记为未读
+New=新
+(No description)=(无描述)
+No maillist=无建组
 From=发件人
-Reply=回复
-Reply all=回复所有
-Forward=转发
+Delete=删除
+Subject=主题
+CC=抄送
+To=收件人
+You have mail! Type /mail to read=
 Filter=筛选
 Allow multiple selection=允许多选
 @1 of @2 selected=
 (Un)select all=(取消)选中所有
 No mail=无邮件
+Date=时间
+Ascending=升序
+Descending=降序
 Read=浏览
-(No description)=(无描述)
-No maillist=无建组
-Note=备注
-Edit=编辑
-New=新
-Delete=删除
-You have mail! Type /mail to read=
-Subject=主题
-To=收件人
+Reply=回复
+Reply all=回复所有
+Forward=转发
 Add=添加
 Remove=移除
-Name=名字
-CC=抄送
+Note=备注
+Back=返回
 Notifications=
 Chat notifications=
 On join notifications=
@@ -70,25 +76,7 @@ Default sorting fields=
 Other=
 Move deleted messages to trash=
 Reset=
-Settings=
-About=关于
-Save=保存
-Ascending=升序
-Descending=降序
-Date=时间
 From/To=
 Restore=
+Empty=
 Trash is empty=
-
-
-##### not used anymore #####
-
-your contacts.=你的联系人。
-The contact=联系人
-That name=那个名字
-is already in=已经在
-name cannot=名字不可以
-be empty.=是空的。
-your maillists.=你的建组。
-The maillist=建组
-selected=选中
diff --git a/locale/mail.zh_TW.tr b/locale/mail.zh_TW.tr
index f663233..35b54ac 100644
--- a/locale/mail.zh_TW.tr
+++ b/locale/mail.zh_TW.tr
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=
 Communication using this system is NOT guaranteed to be private!=
 Admins are able to view the messages of any player.=
 Contributors=
+Settings=
+About=關於
 You have a new message from @1! Subject: @2=
 To view it, type /mail=
 You could also use the button in your inventory.=
@@ -13,18 +15,9 @@ BCC=密件副本
 Cancel=取消
 Save draft=儲存草稿
 Send=發送
+Name=名稱
 No drafts=沒有草稿
-Player name=玩家名稱
-That name is already in your contacts=
-The contact name cannot be empty.=
-Maillist name=郵件列表名稱
-Desc=描述
-Players=玩家
-That name is already in your mailing lists.=
-The mailing list name cannot be empty.=
-Back=返回
-Mark Read=標記已讀
-Mark Unread=標記未讀
+Edit=編輯
 Trash=
 Inbox=收件箱
 Outbox=寄件備份
@@ -34,29 +27,42 @@ Mail lists=郵件列表
 Options=
 Close=關閉
 (No subject)=（沒有主旨）
+Player name=玩家名稱
+That name is already in your contacts=
+The contact name cannot be empty.=
+Maillist name=郵件列表名稱
+Desc=描述
+Players=玩家
+That name is already in your mailing lists.=
+The mailing list name cannot be empty.=
+Save=儲存
+Mark Read=標記已讀
+Mark Unread=標記未讀
+New=新建
+(No description)=（沒有描述）
+No maillist=沒有郵件列表
 From=寄件者
-Reply=回覆
-Reply all=回覆所有人
-Forward=轉寄
+Delete=刪除
+Subject=主旨
+CC=副本
+To=收件人
+You have mail! Type /mail to read=
 Filter=
 Allow multiple selection=
 @1 of @2 selected=
 (Un)select all=
 No mail=沒有郵件
+Date=日期
+Ascending=
+Descending=
 Read=閱讀
-(No description)=（沒有描述）
-No maillist=沒有郵件列表
-Note=備註
-Edit=編輯
-New=新建
-Delete=刪除
-You have mail! Type /mail to read=
-Subject=主旨
-To=收件人
+Reply=回覆
+Reply all=回覆所有人
+Forward=轉寄
 Add=加入
 Remove=移除
-Name=名稱
-CC=副本
+Note=備註
+Back=返回
 Notifications=
 Chat notifications=
 On join notifications=
@@ -69,12 +75,7 @@ Default sorting fields=
 Other=
 Move deleted messages to trash=
 Reset=
-Settings=
-About=關於
-Save=儲存
-Ascending=
-Descending=
-Date=日期
 From/To=
 Restore=
+Empty=
 Trash is empty=
diff --git a/locale/template.txt b/locale/template.txt
index aec3752..4399f79 100644
--- a/locale/template.txt
+++ b/locale/template.txt
@@ -6,6 +6,8 @@ Expat (code), WTFPL (textures)=
 Communication using this system is NOT guaranteed to be private!=
 Admins are able to view the messages of any player.=
 Contributors=
+Settings=
+About=
 You have a new message from @1! Subject: @2=
 To view it, type /mail=
 You could also use the button in your inventory.=
@@ -13,18 +15,9 @@ BCC=
 Cancel=
 Save draft=
 Send=
+Name=
 No drafts=
-Player name=
-That name is already in your contacts=
-The contact name cannot be empty.=
-Maillist name=
-Desc=
-Players=
-That name is already in your mailing lists.=
-The mailing list name cannot be empty.=
-Back=
-Mark Read=
-Mark Unread=
+Edit=
 Trash=
 Inbox=
 Outbox=
@@ -34,29 +27,42 @@ Mail lists=
 Options=
 Close=
 (No subject)=
+Player name=
+That name is already in your contacts=
+The contact name cannot be empty.=
+Maillist name=
+Desc=
+Players=
+That name is already in your mailing lists.=
+The mailing list name cannot be empty.=
+Save=
+Mark Read=
+Mark Unread=
+New=
+(No description)=
+No maillist=
 From=
-Reply=
-Reply all=
-Forward=
+Delete=
+Subject=
+CC=
+To=
+You have mail! Type /mail to read=
 Filter=
 Allow multiple selection=
 @1 of @2 selected=
 (Un)select all=
 No mail=
+Date=
+Ascending=
+Descending=
 Read=
-(No description)=
-No maillist=
-Note=
-Edit=
-New=
-Delete=
-You have mail! Type /mail to read=
-Subject=
-To=
+Reply=
+Reply all=
+Forward=
 Add=
 Remove=
-Name=
-CC=
+Note=
+Back=
 Notifications=
 Chat notifications=
 On join notifications=
@@ -69,12 +75,7 @@ Default sorting fields=
 Other=
 Move deleted messages to trash=
 Reset=
-Settings=
-About=
-Save=
-Ascending=
-Descending=
-Date=
 From/To=
 Restore=
+Empty=
 Trash is empty=
diff --git a/storage.lua b/storage.lua
index 6b011a4..3c3b994 100644
--- a/storage.lua
+++ b/storage.lua
@@ -267,6 +267,14 @@ function mail.restore_mail(playername, msg_id)
 	return
 end
 
+-- clear the trash
+function mail.empty_trash(playername)
+	local entry = mail.get_storage_entry(playername)
+	entry.trash = {}
+	mail.set_storage_entry(playername, entry)
+	return
+end
+
 -- add or update a contact
 function mail.update_contact(playername, contact)
 	local entry = mail.get_storage_entry(playername)
diff --git a/ui/events.lua b/ui/events.lua
index 009a7a2..6bf0f48 100644
--- a/ui/events.lua
+++ b/ui/events.lua
@@ -293,6 +293,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
     elseif fields.new then
         mail.show_compose(name)
 
+    elseif fields.empty then
+        mail.empty_trash(name)
+        mail.show_mail_menu(name)
+
     elseif fields.contacts then
         mail.show_contacts(name)
 
diff --git a/ui/trash.lua b/ui/trash.lua
index 892a29a..28380cb 100644
--- a/ui/trash.lua
+++ b/ui/trash.lua
@@ -9,6 +9,7 @@ local trash_formspec = "size[8.5,10;]" .. mail.theme .. [[
 	button[6,0.95;2.5,0.5;read;]] .. S("Read") .. [[]
 	button[6,1.70;2.5,0.5;restore;]] .. S("Restore") .. [[]
 	button[6,2.45;2.5,0.5;delete;]] .. S("Delete") .. [[]
+	button[6,3.20;2.5,0.5;empty;]] .. S("Empty") .. [[]
 	button[6,6.8;2.5,0.5;contacts;]] .. S("Contacts") .. [[]
 	button[6,7.6;2.5,0.5;maillists;]] .. S("Mail lists") .. [[]
 	button[6,8.7;2.5,0.5;options;]] .. S("Options") .. [[]