diff --git a/l10n/af.js b/l10n/af.js
index 959d9cbfc..482242911 100644
--- a/l10n/af.js
+++ b/l10n/af.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Retry" : "Herprobeer",
     "Message sent!" : "Boodskap gestuur!",
     "Send" : "Stuur",
+    "Favorite" : "Gunsteling",
     "Delete" : "Skrap",
     "Reply" : "Antwoord",
     "Forward" : "Stuur aan",
diff --git a/l10n/af.json b/l10n/af.json
index dadc17ce2..7146b7d80 100644
--- a/l10n/af.json
+++ b/l10n/af.json
@@ -23,6 +23,7 @@
     "Retry" : "Herprobeer",
     "Message sent!" : "Boodskap gestuur!",
     "Send" : "Stuur",
+    "Favorite" : "Gunsteling",
     "Delete" : "Skrap",
     "Reply" : "Antwoord",
     "Forward" : "Stuur aan",
diff --git a/l10n/ar.js b/l10n/ar.js
index 0477a5a1e..906ee61ea 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Send" : "أرسل",
     "Choose a file to add as attachment" : "اختر ملف لإضافته كمرفق",
     "Draft: " : "المسودة:",
+    "Favorite" : "المفضلة",
     "Delete" : "حذف",
     "Not found" : "غير موجود",
     "Reply" : "رد",
diff --git a/l10n/ar.json b/l10n/ar.json
index 88bf5f713..60ae64cfe 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -35,6 +35,7 @@
     "Send" : "أرسل",
     "Choose a file to add as attachment" : "اختر ملف لإضافته كمرفق",
     "Draft: " : "المسودة:",
+    "Favorite" : "المفضلة",
     "Delete" : "حذف",
     "Not found" : "غير موجود",
     "Reply" : "رد",
diff --git a/l10n/ast.js b/l10n/ast.js
index 93bf59c88..ef4b9c832 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -29,6 +29,7 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaxe unviáu!",
     "Send" : "Unviar",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
+    "Favorite" : "Marcar como favoritu",
     "Delete" : "Desaniciar",
     "Reply" : "Rempuesta",
     "Could not load your message" : "Nun pudo cargase'l to mensaxe",
diff --git a/l10n/ast.json b/l10n/ast.json
index c22f318bc..b3290d63a 100644
--- a/l10n/ast.json
+++ b/l10n/ast.json
@@ -27,6 +27,7 @@
     "Message sent!" : "¡Mensaxe unviáu!",
     "Send" : "Unviar",
     "Choose a file to add as attachment" : "Escueyi un ficheru p'amestalu como axuntu",
+    "Favorite" : "Marcar como favoritu",
     "Delete" : "Desaniciar",
     "Reply" : "Rempuesta",
     "Could not load your message" : "Nun pudo cargase'l to mensaxe",
diff --git a/l10n/az.js b/l10n/az.js
index 1043ef2d0..7ae412cf8 100644
--- a/l10n/az.js
+++ b/l10n/az.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Sending …" : "Göndərilir...",
     "Send" : "Göndər",
     "Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
+    "Favorite" : "İstəkli",
     "Delete" : "Sil",
     "Reply" : "Cavab",
     "Choose a folder to store the attachment in" : "Əlavələrin saxlanılması üçün qovluğu seçin",
diff --git a/l10n/az.json b/l10n/az.json
index 256df4c2a..2c6e1d8f0 100644
--- a/l10n/az.json
+++ b/l10n/az.json
@@ -11,6 +11,7 @@
     "Sending …" : "Göndərilir...",
     "Send" : "Göndər",
     "Choose a file to add as attachment" : "Əlavə ediləcək faylı seçin",
+    "Favorite" : "İstəkli",
     "Delete" : "Sil",
     "Reply" : "Cavab",
     "Choose a folder to store the attachment in" : "Əlavələrin saxlanılması üçün qovluğu seçin",
diff --git a/l10n/bg.js b/l10n/bg.js
index ddde5a6f6..821c024cb 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Rich text" : "Форматиран текст",
     "No messages in this folder" : "Няма съобщения",
     "Draft: " : "Чернова: ",
+    "Favorite" : "Любима",
     "Mark read" : "Маркирай като прочетено",
     "Mark unread" : "Маркирай като непрочетено",
     "Delete" : "Изтриване",
diff --git a/l10n/bg.json b/l10n/bg.json
index a8081a51a..1bbe75aa6 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -47,6 +47,7 @@
     "Rich text" : "Форматиран текст",
     "No messages in this folder" : "Няма съобщения",
     "Draft: " : "Чернова: ",
+    "Favorite" : "Любима",
     "Mark read" : "Маркирай като прочетено",
     "Mark unread" : "Маркирай като непрочетено",
     "Delete" : "Изтриване",
diff --git a/l10n/cs.js b/l10n/cs.js
index 691ac406a..8e5d0c907 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -69,7 +69,7 @@ OC.L10N.register(
     "No messages in this folder" : "V této složce nejsou žádné zprávy",
     "Draft: " : "Koncept:",
     "Unfavorite" : "Odebrat z oblíbených",
-    "Favorite" : "Oblíbená",
+    "Favorite" : "Oblíbené",
     "Mark read" : "Označit jako přečtené",
     "Mark unread" : "Označit jako nepřečtené",
     "Delete" : "Smazat",
diff --git a/l10n/cs.json b/l10n/cs.json
index 1a17a3fd9..5f59d65ef 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -67,7 +67,7 @@
     "No messages in this folder" : "V této složce nejsou žádné zprávy",
     "Draft: " : "Koncept:",
     "Unfavorite" : "Odebrat z oblíbených",
-    "Favorite" : "Oblíbená",
+    "Favorite" : "Oblíbené",
     "Mark read" : "Označit jako přečtené",
     "Mark unread" : "Označit jako nepřečtené",
     "Delete" : "Smazat",
diff --git a/l10n/de.js b/l10n/de.js
index 630f855a1..0fb085224 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "Rich-Text",
     "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
     "Draft: " : "Entwurf:",
+    "Unfavorite" : "Nicht favorisieren",
+    "Favorite" : "Favorit",
     "Mark read" : "Als gelesen markieren",
     "Mark unread" : "Als ungelesen markieren",
     "Delete" : "Löschen",
diff --git a/l10n/de.json b/l10n/de.json
index 65a1e6096..0114f8aa5 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -66,6 +66,8 @@
     "Rich text" : "Rich-Text",
     "No messages in this folder" : "Keine Nachrichten in diesem Ordner",
     "Draft: " : "Entwurf:",
+    "Unfavorite" : "Nicht favorisieren",
+    "Favorite" : "Favorit",
     "Mark read" : "Als gelesen markieren",
     "Mark unread" : "Als ungelesen markieren",
     "Delete" : "Löschen",
diff --git a/l10n/en_GB.js b/l10n/en_GB.js
index 01d4ef87f..1d8a2f95f 100644
--- a/l10n/en_GB.js
+++ b/l10n/en_GB.js
@@ -35,6 +35,8 @@ OC.L10N.register(
     "Send" : "Send",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
     "No messages in this folder" : "No messages in this folder",
+    "Unfavorite" : "Unfavourite",
+    "Favorite" : "Favourite",
     "Mark read" : "Mark read",
     "Delete" : "Delete",
     "Not found" : "Not found",
diff --git a/l10n/en_GB.json b/l10n/en_GB.json
index 7e121802e..774a274ca 100644
--- a/l10n/en_GB.json
+++ b/l10n/en_GB.json
@@ -33,6 +33,8 @@
     "Send" : "Send",
     "Choose a file to add as attachment" : "Choose a file to add as attachment",
     "No messages in this folder" : "No messages in this folder",
+    "Unfavorite" : "Unfavourite",
+    "Favorite" : "Favourite",
     "Mark read" : "Mark read",
     "Delete" : "Delete",
     "Not found" : "Not found",
diff --git a/l10n/eo.js b/l10n/eo.js
index 3b20729c1..ec01ce9f0 100644
--- a/l10n/eo.js
+++ b/l10n/eo.js
@@ -48,7 +48,7 @@ OC.L10N.register(
     "Upload attachment" : "Alŝuti kunsendaĵon",
     "Add attachment from Files" : "Aldoni kunsendaĵojn el „Dosieroj“",
     "Enable formatting" : "Ebligi formatado",
-    "Uploading attachments …" : "Alŝutado de kunsendaĵoj...",
+    "Uploading attachments …" : "Alŝutas kunsendaĵojn...",
     "Sending …" : "Sendado...",
     "Error sending your message" : "Eraro dum sendo de via mesaĝo",
     "Go back" : "Reveni",
@@ -56,13 +56,15 @@ OC.L10N.register(
     "Message sent!" : "Mesaĝo sendiĝis!",
     "Write another message" : "Verki alian mesaĝon",
     "Send" : "Sendi",
-    "Uploading {percent}% …" : "Alŝutado {percent} %…",
+    "Uploading {percent}% …" : "Alŝutas {percent} %…",
     "Choose a file to add as attachment" : "Elektu dosieron aldonotan kiel kunsendaĵon",
     "Writing mode" : "Skribreĝimo",
     "Preferred writing mode for new messages and replies." : "Prefera skribreĝimo por novaj mesaĝoj kaj respondoj.",
     "Plain text" : "Ebenaĵa teksto",
     "No messages in this folder" : "Neniu mesaĝo en tiu dosierujo",
     "Draft: " : "Malneto:",
+    "Unfavorite" : "Malpliŝatati",
+    "Favorite" : "Pliŝatati",
     "Mark read" : "Marki kiel legita",
     "Mark unread" : "Marki kiel nelegita",
     "Delete" : "Forigi",
@@ -70,6 +72,7 @@ OC.L10N.register(
     "Report this bug" : "Raporti tiun problemon",
     "Could not open mailbox" : "Ne eblis malfermi poŝtkesto",
     "Loading messages" : "Ŝargas mesaĝojn",
+    "Indexing your messages. This can take a bit longer for larger mailboxes." : "Indeksas viajn mesaĝojn. Tio eble daŭrus iom pli longe por pli grandaj poŝtkestoj.",
     "Not found" : "Ne trovita",
     "Reply" : "Respondi",
     "Reply to sender only" : "Respondi nur al sendinto",
@@ -79,6 +82,7 @@ OC.L10N.register(
     "Download attachment" : "Elŝuti kunsendaĵon",
     "Save to Files" : "Konservi en „Dosieroj“",
     "Unnamed" : "Nenomita",
+    "Embedded message" : "Enkorpiga mesaĝo",
     "Choose a folder to store the attachment in" : "Elektu dosierujon en kiu konservi la kunsendaĵon",
     "Save all to Files" : "Konservi ĉiujn al „Dosieroj“",
     "Choose a folder to store the attachments in" : "Elektu dosierujon en kiu konservi la kunsendaĵojn",
@@ -106,17 +110,26 @@ OC.L10N.register(
     "Signature …" : "Subskribo …",
     "Save signature" : "Konservi subskribon",
     "Import into {calendar}" : "Importi en {calendar}",
+    "Event imported into {calendar}" : "Okazaĵo importis en {calendar}",
     "Could not create event" : "Ne eblis krei okazaĵon",
     "Airplane" : "Aviadilo",
+    "Reservation {id}" : "Rezervejo {id}",
+    "Flight {flightNr} from {depAirport} to {arrAirport}" : "Flugo {flightNr} de {depAirport} al {arrAirport}",
     "Train" : "Trajno",
     "{trainNr} from {depStation} to {arrStation}" : "{trainNr} de {depStation} al {arrStation}",
     "Train from {depStation} to {arrStation}" : "Trajno de {depStation} al {arrStation}",
     "Mail app" : "Retpoŝtprogrameto",
+    "Email: {email}" : "Retpoŝto: {email}",
     "General" : "Ĝenerala",
     "Email address" : "Retpoŝtadreso",
+    "IMAP" : "IMAP",
     "User" : "Uzanto",
     "Host" : "Gastigo",
     "Port" : "Pordo",
+    "SMTP" : "SMTP",
+    "Apply and create/update for all users" : "Apliki kaj krei/ĝisdatigi por ĉiuj uzantoj",
+    "Account settings" : "Kontaj agordoj",
+    "Change name" : "Ŝanĝi nomon",
     "Mail server" : "Retpoŝtoservilo",
     "Speed up your Mail experience with these quick shortcuts." : "Plirapidiĝu per tiuj fulmoklavoj.",
     "Compose new message" : "Krei novan mesaĝon",
@@ -140,10 +153,10 @@ OC.L10N.register(
     "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mesaĝo\nel {from}","%n novaj mesaĝoj \nel {from}"],
     "Nextcloud Mail" : "Nextcloud-retpoŝtilo",
     "Could not load {tag}{name}{endtag}" : "Ne eblis ŝargi {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Problemo okazis dum ŝargo de {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Problemo okazis dum ŝargi {tag}{name}{endtag}",
     "Could not load the desired message" : "Ne eblis ŝargi la deziratan mesaĝon",
     "Could not load the message" : "Ne eblis ŝargi la mesaĝon",
-    "Error loading message" : "Eraro dum ŝargo de mesaĝo",
+    "Error loading message" : "Eraris ŝargi mesaĝon",
     "Forwarding to %s" : "Plusendi al %s",
     "Click here if you are not automatically redirected within the next few seconds." : "Alklaku ĉi tie, ĉu vi ne estos aŭtomate alidirektita post kelkaj sekundoj.",
     "Redirect" : "Alidirekto",
diff --git a/l10n/eo.json b/l10n/eo.json
index c0decd0d9..932aa1c53 100644
--- a/l10n/eo.json
+++ b/l10n/eo.json
@@ -46,7 +46,7 @@
     "Upload attachment" : "Alŝuti kunsendaĵon",
     "Add attachment from Files" : "Aldoni kunsendaĵojn el „Dosieroj“",
     "Enable formatting" : "Ebligi formatado",
-    "Uploading attachments …" : "Alŝutado de kunsendaĵoj...",
+    "Uploading attachments …" : "Alŝutas kunsendaĵojn...",
     "Sending …" : "Sendado...",
     "Error sending your message" : "Eraro dum sendo de via mesaĝo",
     "Go back" : "Reveni",
@@ -54,13 +54,15 @@
     "Message sent!" : "Mesaĝo sendiĝis!",
     "Write another message" : "Verki alian mesaĝon",
     "Send" : "Sendi",
-    "Uploading {percent}% …" : "Alŝutado {percent} %…",
+    "Uploading {percent}% …" : "Alŝutas {percent} %…",
     "Choose a file to add as attachment" : "Elektu dosieron aldonotan kiel kunsendaĵon",
     "Writing mode" : "Skribreĝimo",
     "Preferred writing mode for new messages and replies." : "Prefera skribreĝimo por novaj mesaĝoj kaj respondoj.",
     "Plain text" : "Ebenaĵa teksto",
     "No messages in this folder" : "Neniu mesaĝo en tiu dosierujo",
     "Draft: " : "Malneto:",
+    "Unfavorite" : "Malpliŝatati",
+    "Favorite" : "Pliŝatati",
     "Mark read" : "Marki kiel legita",
     "Mark unread" : "Marki kiel nelegita",
     "Delete" : "Forigi",
@@ -68,6 +70,7 @@
     "Report this bug" : "Raporti tiun problemon",
     "Could not open mailbox" : "Ne eblis malfermi poŝtkesto",
     "Loading messages" : "Ŝargas mesaĝojn",
+    "Indexing your messages. This can take a bit longer for larger mailboxes." : "Indeksas viajn mesaĝojn. Tio eble daŭrus iom pli longe por pli grandaj poŝtkestoj.",
     "Not found" : "Ne trovita",
     "Reply" : "Respondi",
     "Reply to sender only" : "Respondi nur al sendinto",
@@ -77,6 +80,7 @@
     "Download attachment" : "Elŝuti kunsendaĵon",
     "Save to Files" : "Konservi en „Dosieroj“",
     "Unnamed" : "Nenomita",
+    "Embedded message" : "Enkorpiga mesaĝo",
     "Choose a folder to store the attachment in" : "Elektu dosierujon en kiu konservi la kunsendaĵon",
     "Save all to Files" : "Konservi ĉiujn al „Dosieroj“",
     "Choose a folder to store the attachments in" : "Elektu dosierujon en kiu konservi la kunsendaĵojn",
@@ -104,17 +108,26 @@
     "Signature …" : "Subskribo …",
     "Save signature" : "Konservi subskribon",
     "Import into {calendar}" : "Importi en {calendar}",
+    "Event imported into {calendar}" : "Okazaĵo importis en {calendar}",
     "Could not create event" : "Ne eblis krei okazaĵon",
     "Airplane" : "Aviadilo",
+    "Reservation {id}" : "Rezervejo {id}",
+    "Flight {flightNr} from {depAirport} to {arrAirport}" : "Flugo {flightNr} de {depAirport} al {arrAirport}",
     "Train" : "Trajno",
     "{trainNr} from {depStation} to {arrStation}" : "{trainNr} de {depStation} al {arrStation}",
     "Train from {depStation} to {arrStation}" : "Trajno de {depStation} al {arrStation}",
     "Mail app" : "Retpoŝtprogrameto",
+    "Email: {email}" : "Retpoŝto: {email}",
     "General" : "Ĝenerala",
     "Email address" : "Retpoŝtadreso",
+    "IMAP" : "IMAP",
     "User" : "Uzanto",
     "Host" : "Gastigo",
     "Port" : "Pordo",
+    "SMTP" : "SMTP",
+    "Apply and create/update for all users" : "Apliki kaj krei/ĝisdatigi por ĉiuj uzantoj",
+    "Account settings" : "Kontaj agordoj",
+    "Change name" : "Ŝanĝi nomon",
     "Mail server" : "Retpoŝtoservilo",
     "Speed up your Mail experience with these quick shortcuts." : "Plirapidiĝu per tiuj fulmoklavoj.",
     "Compose new message" : "Krei novan mesaĝon",
@@ -138,10 +151,10 @@
     "_%n new message \nfrom {from}_::_%n new messages \nfrom {from}_" : ["%n nova mesaĝo\nel {from}","%n novaj mesaĝoj \nel {from}"],
     "Nextcloud Mail" : "Nextcloud-retpoŝtilo",
     "Could not load {tag}{name}{endtag}" : "Ne eblis ŝargi {tag}{name}{endtag}",
-    "There was a problem loading {tag}{name}{endtag}" : "Problemo okazis dum ŝargo de {tag}{name}{endtag}",
+    "There was a problem loading {tag}{name}{endtag}" : "Problemo okazis dum ŝargi {tag}{name}{endtag}",
     "Could not load the desired message" : "Ne eblis ŝargi la deziratan mesaĝon",
     "Could not load the message" : "Ne eblis ŝargi la mesaĝon",
-    "Error loading message" : "Eraro dum ŝargo de mesaĝo",
+    "Error loading message" : "Eraris ŝargi mesaĝon",
     "Forwarding to %s" : "Plusendi al %s",
     "Click here if you are not automatically redirected within the next few seconds." : "Alklaku ĉi tie, ĉu vi ne estos aŭtomate alidirektita post kelkaj sekundoj.",
     "Redirect" : "Alidirekto",
diff --git a/l10n/es_EC.js b/l10n/es_EC.js
index 1d5b10441..0f4c20230 100644
--- a/l10n/es_EC.js
+++ b/l10n/es_EC.js
@@ -35,6 +35,8 @@ OC.L10N.register(
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
     "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_EC.json b/l10n/es_EC.json
index d7d654165..a457945c0 100644
--- a/l10n/es_EC.json
+++ b/l10n/es_EC.json
@@ -33,6 +33,8 @@
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
     "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_GT.js b/l10n/es_GT.js
index 7d5355cb9..aa93ace2c 100644
--- a/l10n/es_GT.js
+++ b/l10n/es_GT.js
@@ -35,6 +35,8 @@ OC.L10N.register(
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
     "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_GT.json b/l10n/es_GT.json
index 60bcc18cb..ef0e2962a 100644
--- a/l10n/es_GT.json
+++ b/l10n/es_GT.json
@@ -33,6 +33,8 @@
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
     "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_HN.js b/l10n/es_HN.js
index 2aaa35c90..09336734f 100644
--- a/l10n/es_HN.js
+++ b/l10n/es_HN.js
@@ -33,6 +33,8 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_HN.json b/l10n/es_HN.json
index bb9495b3d..be1c1ac76 100644
--- a/l10n/es_HN.json
+++ b/l10n/es_HN.json
@@ -31,6 +31,8 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_PA.js b/l10n/es_PA.js
index 2aaa35c90..09336734f 100644
--- a/l10n/es_PA.js
+++ b/l10n/es_PA.js
@@ -33,6 +33,8 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_PA.json b/l10n/es_PA.json
index bb9495b3d..be1c1ac76 100644
--- a/l10n/es_PA.json
+++ b/l10n/es_PA.json
@@ -31,6 +31,8 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_PR.js b/l10n/es_PR.js
index c92c80a52..d14584289 100644
--- a/l10n/es_PR.js
+++ b/l10n/es_PR.js
@@ -33,6 +33,8 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_PR.json b/l10n/es_PR.json
index 00646fe1e..77718760b 100644
--- a/l10n/es_PR.json
+++ b/l10n/es_PR.json
@@ -31,6 +31,8 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_SV.js b/l10n/es_SV.js
index 1d5b10441..0f4c20230 100644
--- a/l10n/es_SV.js
+++ b/l10n/es_SV.js
@@ -35,6 +35,8 @@ OC.L10N.register(
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
     "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_SV.json b/l10n/es_SV.json
index d7d654165..a457945c0 100644
--- a/l10n/es_SV.json
+++ b/l10n/es_SV.json
@@ -33,6 +33,8 @@
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
     "No messages in this folder" : "No hay mensajes en esta carpeta",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_UY.js b/l10n/es_UY.js
index 2aaa35c90..09336734f 100644
--- a/l10n/es_UY.js
+++ b/l10n/es_UY.js
@@ -33,6 +33,8 @@ OC.L10N.register(
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/es_UY.json b/l10n/es_UY.json
index bb9495b3d..be1c1ac76 100644
--- a/l10n/es_UY.json
+++ b/l10n/es_UY.json
@@ -31,6 +31,8 @@
     "Message sent!" : "¡Mensaje enviado!",
     "Send" : "Enviar",
     "Choose a file to add as attachment" : "Selecciona el archivo a agregar como adjunto",
+    "Unfavorite" : "Quitar favorito",
+    "Favorite" : "Hacer favorito",
     "Mark read" : "Marcar como leído",
     "Delete" : "Borrar",
     "Reply" : "Responder",
diff --git a/l10n/et_EE.js b/l10n/et_EE.js
index e3c59b9b1..f6c60fc0e 100644
--- a/l10n/et_EE.js
+++ b/l10n/et_EE.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Message sent!" : "Sõnum on saadetud!",
     "Send" : "Saada",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
+    "Favorite" : "Lemmik",
     "Mark read" : "Märgi loetuks",
     "Delete" : "Kustuta",
     "Reply" : "Vasta",
diff --git a/l10n/et_EE.json b/l10n/et_EE.json
index a4ada5eec..e8cd67a52 100644
--- a/l10n/et_EE.json
+++ b/l10n/et_EE.json
@@ -26,6 +26,7 @@
     "Message sent!" : "Sõnum on saadetud!",
     "Send" : "Saada",
     "Choose a file to add as attachment" : "Vali fail, mida manustada",
+    "Favorite" : "Lemmik",
     "Mark read" : "Märgi loetuks",
     "Delete" : "Kustuta",
     "Reply" : "Vasta",
diff --git a/l10n/fa.js b/l10n/fa.js
index da57f420e..cacbd9198 100644
--- a/l10n/fa.js
+++ b/l10n/fa.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "متن غنی",
     "No messages in this folder" : "هیچ پیامی در این پوشه وجود ندارد",
     "Draft: " : "پیش نویس:",
+    "Unfavorite" : "ناخوشایند",
+    "Favorite" : "برگزیده",
     "Mark read" : "علامت گذاری به عنوان خوانده شده",
     "Mark unread" : "علامت گذاری به عنوان خوانده نشده",
     "Delete" : "حذف",
diff --git a/l10n/fa.json b/l10n/fa.json
index d2ae8f2e2..a82ce654a 100644
--- a/l10n/fa.json
+++ b/l10n/fa.json
@@ -66,6 +66,8 @@
     "Rich text" : "متن غنی",
     "No messages in this folder" : "هیچ پیامی در این پوشه وجود ندارد",
     "Draft: " : "پیش نویس:",
+    "Unfavorite" : "ناخوشایند",
+    "Favorite" : "برگزیده",
     "Mark read" : "علامت گذاری به عنوان خوانده شده",
     "Mark unread" : "علامت گذاری به عنوان خوانده نشده",
     "Delete" : "حذف",
diff --git a/l10n/fr.js b/l10n/fr.js
index d2c311892..5e29cf748 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "Texte riche",
     "No messages in this folder" : "Aucun message dans ce dossier",
     "Draft: " : "Brouillon :",
+    "Unfavorite" : "Ne plus marquer comme favori",
+    "Favorite" : "Favori",
     "Mark read" : "Marquer comme lu",
     "Mark unread" : "Marquer comme non-lu",
     "Delete" : "Supprimer",
diff --git a/l10n/fr.json b/l10n/fr.json
index bfce93db2..cd27c8ccd 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -66,6 +66,8 @@
     "Rich text" : "Texte riche",
     "No messages in this folder" : "Aucun message dans ce dossier",
     "Draft: " : "Brouillon :",
+    "Unfavorite" : "Ne plus marquer comme favori",
+    "Favorite" : "Favori",
     "Mark read" : "Marquer comme lu",
     "Mark unread" : "Marquer comme non-lu",
     "Delete" : "Supprimer",
diff --git a/l10n/gl.js b/l10n/gl.js
index 396e12358..bc2edefaa 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "Texto mellorado",
     "No messages in this folder" : "Non hai mensaxes neste cartafol",
     "Draft: " : "Borrador:",
+    "Unfavorite" : "Desmarcar como favorito",
+    "Favorite" : "Favorito",
     "Mark read" : "Marcar como lido",
     "Mark unread" : "Marcar como sen ler",
     "Delete" : "Eliminar",
diff --git a/l10n/gl.json b/l10n/gl.json
index f9587699a..a9b00212e 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -66,6 +66,8 @@
     "Rich text" : "Texto mellorado",
     "No messages in this folder" : "Non hai mensaxes neste cartafol",
     "Draft: " : "Borrador:",
+    "Unfavorite" : "Desmarcar como favorito",
+    "Favorite" : "Favorito",
     "Mark read" : "Marcar como lido",
     "Mark unread" : "Marcar como sen ler",
     "Delete" : "Eliminar",
diff --git a/l10n/hr.js b/l10n/hr.js
index a9d2118ff..0502cb63c 100644
--- a/l10n/hr.js
+++ b/l10n/hr.js
@@ -63,6 +63,8 @@ OC.L10N.register(
     "Rich text" : "Bogat tekst",
     "No messages in this folder" : "Nema poruka u ovoj mapi",
     "Draft: " : "Skica: ",
+    "Unfavorite" : "Ukloni iz favorita",
+    "Favorite" : "Favorit",
     "Mark read" : "Označi kao pročitano",
     "Mark unread" : "Označi kao nepročitano",
     "Delete" : "Izbriši",
diff --git a/l10n/hr.json b/l10n/hr.json
index ffe3c8e01..15ca68d22 100644
--- a/l10n/hr.json
+++ b/l10n/hr.json
@@ -61,6 +61,8 @@
     "Rich text" : "Bogat tekst",
     "No messages in this folder" : "Nema poruka u ovoj mapi",
     "Draft: " : "Skica: ",
+    "Unfavorite" : "Ukloni iz favorita",
+    "Favorite" : "Favorit",
     "Mark read" : "Označi kao pročitano",
     "Mark unread" : "Označi kao nepročitano",
     "Delete" : "Izbriši",
diff --git a/l10n/ia.js b/l10n/ia.js
index f52af4af1..fe145c514 100644
--- a/l10n/ia.js
+++ b/l10n/ia.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Message sent!" : "Message inviate!",
     "Send" : "Inviar",
     "Choose a file to add as attachment" : "Selectiona un file pro adder como attachamento",
+    "Favorite" : "Favorite",
     "Delete" : "Deler",
     "Reply" : "Responder",
     "Unnamed" : "Non nominate",
diff --git a/l10n/ia.json b/l10n/ia.json
index 4229b992a..fd7cdd247 100644
--- a/l10n/ia.json
+++ b/l10n/ia.json
@@ -14,6 +14,7 @@
     "Message sent!" : "Message inviate!",
     "Send" : "Inviar",
     "Choose a file to add as attachment" : "Selectiona un file pro adder como attachamento",
+    "Favorite" : "Favorite",
     "Delete" : "Deler",
     "Reply" : "Responder",
     "Unnamed" : "Non nominate",
diff --git a/l10n/is.js b/l10n/is.js
index 5680d5ab9..b5560115e 100644
--- a/l10n/is.js
+++ b/l10n/is.js
@@ -63,6 +63,8 @@ OC.L10N.register(
     "Rich text" : "Sniðinn texti",
     "No messages in this folder" : "Engin skilaboð í þessari möppu",
     "Draft: " : "Drög: ",
+    "Unfavorite" : "Taka úr eftirlætum",
+    "Favorite" : "Eftirlæti",
     "Mark read" : "Merkja sem lesið",
     "Mark unread" : "Merkja sem ólesið",
     "Delete" : "Eyða",
diff --git a/l10n/is.json b/l10n/is.json
index 65970ead7..7731101cb 100644
--- a/l10n/is.json
+++ b/l10n/is.json
@@ -61,6 +61,8 @@
     "Rich text" : "Sniðinn texti",
     "No messages in this folder" : "Engin skilaboð í þessari möppu",
     "Draft: " : "Drög: ",
+    "Unfavorite" : "Taka úr eftirlætum",
+    "Favorite" : "Eftirlæti",
     "Mark read" : "Merkja sem lesið",
     "Mark unread" : "Merkja sem ólesið",
     "Delete" : "Eyða",
diff --git a/l10n/ja.js b/l10n/ja.js
index 776fd61b5..7eed2b382 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -63,6 +63,8 @@ OC.L10N.register(
     "Rich text" : "リッチテキスト",
     "No messages in this folder" : "このフォルダーにメッセージはありません",
     "Draft: " : "下書き",
+    "Unfavorite" : "お気に入りから外す",
+    "Favorite" : "お気に入り",
     "Mark read" : "既読にする",
     "Mark unread" : "未読にする",
     "Delete" : "削除",
diff --git a/l10n/ja.json b/l10n/ja.json
index f3b485f04..5d2cd972d 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -61,6 +61,8 @@
     "Rich text" : "リッチテキスト",
     "No messages in this folder" : "このフォルダーにメッセージはありません",
     "Draft: " : "下書き",
+    "Unfavorite" : "お気に入りから外す",
+    "Favorite" : "お気に入り",
     "Mark read" : "既読にする",
     "Mark unread" : "未読にする",
     "Delete" : "削除",
diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js
index 2491f32dd..2e22fd85a 100644
--- a/l10n/ka_GE.js
+++ b/l10n/ka_GE.js
@@ -34,6 +34,8 @@ OC.L10N.register(
     "Message sent!" : "წერილი გაგზავნილია!",
     "Send" : "გაგზავნა",
     "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
+    "Unfavorite" : "რჩეულებიდან ამოშლა",
+    "Favorite" : "რჩეული",
     "Mark read" : "მონიშნეთ წაკითხულად",
     "Delete" : "გაუქმება",
     "Reply" : "პასუხი",
diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json
index 74785bd44..71844e696 100644
--- a/l10n/ka_GE.json
+++ b/l10n/ka_GE.json
@@ -32,6 +32,8 @@
     "Message sent!" : "წერილი გაგზავნილია!",
     "Send" : "გაგზავნა",
     "Choose a file to add as attachment" : "დანართად დასამატებლად აირჩიეთ ფაილი",
+    "Unfavorite" : "რჩეულებიდან ამოშლა",
+    "Favorite" : "რჩეული",
     "Mark read" : "მონიშნეთ წაკითხულად",
     "Delete" : "გაუქმება",
     "Reply" : "პასუხი",
diff --git a/l10n/ko.js b/l10n/ko.js
index 43df2aae6..a1de4282f 100644
--- a/l10n/ko.js
+++ b/l10n/ko.js
@@ -40,6 +40,8 @@ OC.L10N.register(
     "Message sent!" : "메시지를 보냈습니다!",
     "Send" : "보내기",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
+    "Unfavorite" : "즐겨찾기에서 삭제",
+    "Favorite" : "즐겨찾기",
     "Mark read" : "읽은 상태로 표시",
     "Delete" : "삭제",
     "Loading messages" : "메세지를 불러오는 중",
diff --git a/l10n/ko.json b/l10n/ko.json
index 7e97e9a5e..5676a3050 100644
--- a/l10n/ko.json
+++ b/l10n/ko.json
@@ -38,6 +38,8 @@
     "Message sent!" : "메시지를 보냈습니다!",
     "Send" : "보내기",
     "Choose a file to add as attachment" : "첨부할 파일을 선택하십시오",
+    "Unfavorite" : "즐겨찾기에서 삭제",
+    "Favorite" : "즐겨찾기",
     "Mark read" : "읽은 상태로 표시",
     "Delete" : "삭제",
     "Loading messages" : "메세지를 불러오는 중",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 84852dd76..997cebd29 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -64,6 +64,8 @@ OC.L10N.register(
     "Rich text" : "Raiškusis tekstas",
     "No messages in this folder" : "Šiame aplankė pranešimų nėra",
     "Draft: " : "Juodraštis: ",
+    "Unfavorite" : "Nebežymėti kaip mėgstamą",
+    "Favorite" : "Mėgstamas",
     "Mark read" : "Žymėti kaip skaitytą",
     "Mark unread" : "Žymėti kaip neskaitytą",
     "Delete" : "Ištrinti",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 9382154a7..bbaa947d2 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -62,6 +62,8 @@
     "Rich text" : "Raiškusis tekstas",
     "No messages in this folder" : "Šiame aplankė pranešimų nėra",
     "Draft: " : "Juodraštis: ",
+    "Unfavorite" : "Nebežymėti kaip mėgstamą",
+    "Favorite" : "Mėgstamas",
     "Mark read" : "Žymėti kaip skaitytą",
     "Mark unread" : "Žymėti kaip neskaitytą",
     "Delete" : "Ištrinti",
diff --git a/l10n/lv.js b/l10n/lv.js
index c6b4d3447..07ccda494 100644
--- a/l10n/lv.js
+++ b/l10n/lv.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Message sent!" : "Vēstule aizsūtīta!",
     "Send" : "Sūtīt",
     "Choose a file to add as attachment" : "Izvēlēties datni ko pievienot kā pielikumu",
+    "Favorite" : "Favorīts",
     "Delete" : "Dzēst",
     "Reply" : "Atbildēt",
     "Forward" : "Turpināt",
diff --git a/l10n/lv.json b/l10n/lv.json
index a466f3037..83d929768 100644
--- a/l10n/lv.json
+++ b/l10n/lv.json
@@ -29,6 +29,7 @@
     "Message sent!" : "Vēstule aizsūtīta!",
     "Send" : "Sūtīt",
     "Choose a file to add as attachment" : "Izvēlēties datni ko pievienot kā pielikumu",
+    "Favorite" : "Favorīts",
     "Delete" : "Dzēst",
     "Reply" : "Atbildēt",
     "Forward" : "Turpināt",
diff --git a/l10n/mk.js b/l10n/mk.js
index ccf1419d6..c89b95592 100644
--- a/l10n/mk.js
+++ b/l10n/mk.js
@@ -63,6 +63,7 @@ OC.L10N.register(
     "Rich text" : "Богат текст",
     "No messages in this folder" : "Нема пораки во оваа папка",
     "Draft: " : "Нацрт:",
+    "Favorite" : "Омилен",
     "Mark read" : "Означи како прочитано",
     "Mark unread" : "Означи како непрочитано",
     "Delete" : "Избриши",
diff --git a/l10n/mk.json b/l10n/mk.json
index d87ff87a0..25e8a7659 100644
--- a/l10n/mk.json
+++ b/l10n/mk.json
@@ -61,6 +61,7 @@
     "Rich text" : "Богат текст",
     "No messages in this folder" : "Нема пораки во оваа папка",
     "Draft: " : "Нацрт:",
+    "Favorite" : "Омилен",
     "Mark read" : "Означи како прочитано",
     "Mark unread" : "Означи како непрочитано",
     "Delete" : "Избриши",
diff --git a/l10n/nl.js b/l10n/nl.js
index ec3d139c8..b3e610a36 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -66,6 +66,8 @@ OC.L10N.register(
     "Rich text" : "Rijke tekst",
     "No messages in this folder" : "Geen berichten in deze map",
     "Draft: " : "Concept:",
+    "Unfavorite" : "Favoriet weghalen",
+    "Favorite" : "Favoriet",
     "Mark read" : "Markeer gelezen",
     "Mark unread" : "Markeer ongelezen",
     "Delete" : "Verwijderen",
diff --git a/l10n/nl.json b/l10n/nl.json
index be45f36f2..95f0cf05e 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -64,6 +64,8 @@
     "Rich text" : "Rijke tekst",
     "No messages in this folder" : "Geen berichten in deze map",
     "Draft: " : "Concept:",
+    "Unfavorite" : "Favoriet weghalen",
+    "Favorite" : "Favoriet",
     "Mark read" : "Markeer gelezen",
     "Mark unread" : "Markeer ongelezen",
     "Delete" : "Verwijderen",
diff --git a/l10n/pl.js b/l10n/pl.js
index c9551b8af..29a5c0eee 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "Tekst sformatowany",
     "No messages in this folder" : "Brak wiadomości w tym folderze",
     "Draft: " : "Wersja robocza:",
+    "Unfavorite" : "Nie ulubione",
+    "Favorite" : "Ulubione",
     "Mark read" : "Oznacz jako przeczytana",
     "Mark unread" : "Oznacz jako nie przeczytana",
     "Delete" : "Usuń",
diff --git a/l10n/pl.json b/l10n/pl.json
index 173f925cf..5780e6475 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -66,6 +66,8 @@
     "Rich text" : "Tekst sformatowany",
     "No messages in this folder" : "Brak wiadomości w tym folderze",
     "Draft: " : "Wersja robocza:",
+    "Unfavorite" : "Nie ulubione",
+    "Favorite" : "Ulubione",
     "Mark read" : "Oznacz jako przeczytana",
     "Mark unread" : "Oznacz jako nie przeczytana",
     "Delete" : "Usuń",
diff --git a/l10n/ps.js b/l10n/ps.js
new file mode 100644
index 000000000..d003107d8
--- /dev/null
+++ b/l10n/ps.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "mail",
+    {
+    "Mail" : "ایمیل",
+    "Name" : "نوم",
+    "Password" : "پاسورډ",
+    "Save" : "ساتل",
+    "Send" : "لېږل",
+    "Favorite" : "په نښه شوی",
+    "Delete" : "ړنګول",
+    "Settings" : "سمونې",
+    "Favorites" : "په نښه شوي"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/l10n/ps.json b/l10n/ps.json
new file mode 100644
index 000000000..f93d51d02
--- /dev/null
+++ b/l10n/ps.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Mail" : "ایمیل",
+    "Name" : "نوم",
+    "Password" : "پاسورډ",
+    "Save" : "ساتل",
+    "Send" : "لېږل",
+    "Favorite" : "په نښه شوی",
+    "Delete" : "ړنګول",
+    "Settings" : "سمونې",
+    "Favorites" : "په نښه شوي"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index a7b685254..5ee4b39dd 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -69,7 +69,7 @@ OC.L10N.register(
     "No messages in this folder" : "Sem mensagens nesta pasta",
     "Draft: " : "Rascunho:",
     "Unfavorite" : "Desfavoritar",
-    "Favorite" : "Favorito",
+    "Favorite" : "Favoritar",
     "Mark read" : "Marcar como lida",
     "Mark unread" : "Marcar como não lida",
     "Delete" : "Excluir",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 75dd0fa91..38a0c0797 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -67,7 +67,7 @@
     "No messages in this folder" : "Sem mensagens nesta pasta",
     "Draft: " : "Rascunho:",
     "Unfavorite" : "Desfavoritar",
-    "Favorite" : "Favorito",
+    "Favorite" : "Favoritar",
     "Mark read" : "Marcar como lida",
     "Mark unread" : "Marcar como não lida",
     "Delete" : "Excluir",
diff --git a/l10n/pt_PT.js b/l10n/pt_PT.js
index 49ac1ffa0..3ddf28c25 100644
--- a/l10n/pt_PT.js
+++ b/l10n/pt_PT.js
@@ -28,6 +28,8 @@ OC.L10N.register(
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Plain text" : "Texto simples",
     "Draft: " : "Rascunho:",
+    "Unfavorite" : "Não favorito",
+    "Favorite" : "Favorito",
     "Mark read" : "Marcar como lido",
     "Mark unread" : "Marcar como não lido",
     "Delete" : "Eliminar",
diff --git a/l10n/pt_PT.json b/l10n/pt_PT.json
index f433fb48c..845b0c7fb 100644
--- a/l10n/pt_PT.json
+++ b/l10n/pt_PT.json
@@ -26,6 +26,8 @@
     "Choose a file to add as attachment" : "Escolha um ficheiro para adicionar como anexo",
     "Plain text" : "Texto simples",
     "Draft: " : "Rascunho:",
+    "Unfavorite" : "Não favorito",
+    "Favorite" : "Favorito",
     "Mark read" : "Marcar como lido",
     "Mark unread" : "Marcar como não lido",
     "Delete" : "Eliminar",
diff --git a/l10n/ro.js b/l10n/ro.js
index f6acd4449..15f4cbb5b 100644
--- a/l10n/ro.js
+++ b/l10n/ro.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Retry" : "Reîncearcă",
     "Message sent!" : "Mesaj trimis!",
     "Send" : "Trimite",
+    "Favorite" : "Favorite",
     "Delete" : "Șterge",
     "Reply" : "Răspunde",
     "Unnamed" : "Fără nume",
diff --git a/l10n/ro.json b/l10n/ro.json
index 36d48cf6e..f3a7f9c77 100644
--- a/l10n/ro.json
+++ b/l10n/ro.json
@@ -19,6 +19,7 @@
     "Retry" : "Reîncearcă",
     "Message sent!" : "Mesaj trimis!",
     "Send" : "Trimite",
+    "Favorite" : "Favorite",
     "Delete" : "Șterge",
     "Reply" : "Răspunde",
     "Unnamed" : "Fără nume",
diff --git a/l10n/ru.js b/l10n/ru.js
index 79d737eb0..f15905b0b 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "Текст с форматированием",
     "No messages in this folder" : "В этой папке нет сообщений",
     "Draft: " : "Черновик:",
+    "Unfavorite" : "Убрать из избранного",
+    "Favorite" : "Добавить в избранное",
     "Mark read" : "Отметить прочитанным",
     "Mark unread" : "Отметить непрочитанным",
     "Delete" : "Удалить",
diff --git a/l10n/ru.json b/l10n/ru.json
index aa334ca0f..06d2275b8 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -66,6 +66,8 @@
     "Rich text" : "Текст с форматированием",
     "No messages in this folder" : "В этой папке нет сообщений",
     "Draft: " : "Черновик:",
+    "Unfavorite" : "Убрать из избранного",
+    "Favorite" : "Добавить в избранное",
     "Mark read" : "Отметить прочитанным",
     "Mark unread" : "Отметить непрочитанным",
     "Delete" : "Удалить",
diff --git a/l10n/sq.js b/l10n/sq.js
index 237a264c7..72cec66f7 100644
--- a/l10n/sq.js
+++ b/l10n/sq.js
@@ -32,6 +32,8 @@ OC.L10N.register(
     "Message sent!" : "Mesazhi u dërgua!",
     "Send" : "Dërgo",
     "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
+    "Unfavorite" : "Jo i/e preferuar",
+    "Favorite" : "I/E Preferuar",
     "Mark read" : "Shëno të lexuar",
     "Delete" : "Fshij",
     "Reply" : "Përgjigju",
diff --git a/l10n/sq.json b/l10n/sq.json
index 9195e8fa1..01b79a3f8 100644
--- a/l10n/sq.json
+++ b/l10n/sq.json
@@ -30,6 +30,8 @@
     "Message sent!" : "Mesazhi u dërgua!",
     "Send" : "Dërgo",
     "Choose a file to add as attachment" : "Zgjidhni një kartelë që të shtohet si bashkëngjitje",
+    "Unfavorite" : "Jo i/e preferuar",
+    "Favorite" : "I/E Preferuar",
     "Mark read" : "Shëno të lexuar",
     "Delete" : "Fshij",
     "Reply" : "Përgjigju",
diff --git a/l10n/sr.js b/l10n/sr.js
index 3eef73c26..66273e1fd 100644
--- a/l10n/sr.js
+++ b/l10n/sr.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "Обогаћени текст",
     "No messages in this folder" : "Нема порука у овој фасцикли",
     "Draft: " : "Нацрт: ",
+    "Unfavorite" : "Склони да је омиљени",
+    "Favorite" : "Омиљени",
     "Mark read" : "Означи као прочитано",
     "Mark unread" : "Означи као непрочитано",
     "Delete" : "Избриши",
diff --git a/l10n/sr.json b/l10n/sr.json
index c81e5921e..229774973 100644
--- a/l10n/sr.json
+++ b/l10n/sr.json
@@ -66,6 +66,8 @@
     "Rich text" : "Обогаћени текст",
     "No messages in this folder" : "Нема порука у овој фасцикли",
     "Draft: " : "Нацрт: ",
+    "Unfavorite" : "Склони да је омиљени",
+    "Favorite" : "Омиљени",
     "Mark read" : "Означи као прочитано",
     "Mark unread" : "Означи као непрочитано",
     "Delete" : "Избриши",
diff --git a/l10n/sr@latin.js b/l10n/sr@latin.js
index 57251242a..23bc3f7f9 100644
--- a/l10n/sr@latin.js
+++ b/l10n/sr@latin.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Connect" : "Poveži se",
     "Select account" : "Označite nalog",
     "Send" : "Pošalji",
+    "Favorite" : "Omiljene",
     "Delete" : "Delete",
     "Reply" : "Odgovori",
     "Forward" : "Prosledi",
diff --git a/l10n/sr@latin.json b/l10n/sr@latin.json
index a5f3891f8..f06efad44 100644
--- a/l10n/sr@latin.json
+++ b/l10n/sr@latin.json
@@ -7,6 +7,7 @@
     "Connect" : "Poveži se",
     "Select account" : "Označite nalog",
     "Send" : "Pošalji",
+    "Favorite" : "Omiljene",
     "Delete" : "Delete",
     "Reply" : "Odgovori",
     "Forward" : "Prosledi",
diff --git a/l10n/ta_LK.js b/l10n/ta_LK.js
index 136afbcea..dde3f3c00 100644
--- a/l10n/ta_LK.js
+++ b/l10n/ta_LK.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "Save" : "சேமிக்க ",
     "Connect" : "இணைக்க",
     "Keyboard shortcuts" : "விசைப்பலகை குறுக்குவழிகள்",
+    "Favorite" : "விருப்பமான",
     "Delete" : "நீக்குக",
     "Settings" : "அமைப்புகள்",
     "Add folder" : "Add folder",
diff --git a/l10n/ta_LK.json b/l10n/ta_LK.json
index 236d6b42f..dc9e1a0fd 100644
--- a/l10n/ta_LK.json
+++ b/l10n/ta_LK.json
@@ -5,6 +5,7 @@
     "Save" : "சேமிக்க ",
     "Connect" : "இணைக்க",
     "Keyboard shortcuts" : "விசைப்பலகை குறுக்குவழிகள்",
+    "Favorite" : "விருப்பமான",
     "Delete" : "நீக்குக",
     "Settings" : "அமைப்புகள்",
     "Add folder" : "Add folder",
diff --git a/l10n/tr.js b/l10n/tr.js
index 674c345aa..132fa8421 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "Zengin metin",
     "No messages in this folder" : "Bu klasörde herhangi bir ileti yok",
     "Draft: " : "Taslak",
+    "Unfavorite" : "Sık Kullanılanlardan Kaldır",
+    "Favorite" : "Sık Kullanılanlara Ekle",
     "Mark read" : "Okunmuş olarak işaretle",
     "Mark unread" : "Okunmamış olarak işaretle",
     "Delete" : "Sil",
diff --git a/l10n/tr.json b/l10n/tr.json
index 455ef71b3..492b1bd16 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -66,6 +66,8 @@
     "Rich text" : "Zengin metin",
     "No messages in this folder" : "Bu klasörde herhangi bir ileti yok",
     "Draft: " : "Taslak",
+    "Unfavorite" : "Sık Kullanılanlardan Kaldır",
+    "Favorite" : "Sık Kullanılanlara Ekle",
     "Mark read" : "Okunmuş olarak işaretle",
     "Mark unread" : "Okunmamış olarak işaretle",
     "Delete" : "Sil",
diff --git a/l10n/uk.js b/l10n/uk.js
index 99aa4a3ad..774fcbb2b 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -19,6 +19,7 @@ OC.L10N.register(
     "Message sent!" : "Повідомлення відправлено!",
     "Send" : "Надіслати",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
+    "Favorite" : "Улюблений",
     "Delete" : "Видалити",
     "Reply" : "Відповісти",
     "Unnamed" : "Без назви",
diff --git a/l10n/uk.json b/l10n/uk.json
index 6d6e46155..8382f5bef 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -17,6 +17,7 @@
     "Message sent!" : "Повідомлення відправлено!",
     "Send" : "Надіслати",
     "Choose a file to add as attachment" : "Обрати файл для вкладення",
+    "Favorite" : "Улюблений",
     "Delete" : "Видалити",
     "Reply" : "Відповісти",
     "Unnamed" : "Без назви",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 0d7ae1b5a..c99e206a8 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -68,6 +68,8 @@ OC.L10N.register(
     "Rich text" : "富文本",
     "No messages in this folder" : "该文件夹内没有消息",
     "Draft: " : "草稿: ",
+    "Unfavorite" : "取消收藏",
+    "Favorite" : "收藏",
     "Mark read" : "标记为已读",
     "Mark unread" : "标记为未读",
     "Delete" : "删除",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 134c143e4..ef8936a31 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -66,6 +66,8 @@
     "Rich text" : "富文本",
     "No messages in this folder" : "该文件夹内没有消息",
     "Draft: " : "草稿: ",
+    "Unfavorite" : "取消收藏",
+    "Favorite" : "收藏",
     "Mark read" : "标记为已读",
     "Mark unread" : "标记为未读",
     "Delete" : "删除",