diff --git a/l10n/gl.js b/l10n/gl.js
index 268a5e6c7a842fc348e8e9c4abc3742986504f3d..920f10d0d3a74bf3b355bc8acb18a39c480ffebd 100644
--- a/l10n/gl.js
+++ b/l10n/gl.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Register as application for mail links" : "Rexistre como aplicación para ligazóns de correo",
     "Show keyboard shortcuts" : "Amosar os atallos de teclado",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Permitirlle á aplicación recoller datos sobre as súas interaccións. A partir destes datos, a aplicación adaptarase ás súas preferencias. Os datos só se almacenarán localmente.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Colocar o meu texto ao final dunha resposta no canto de enriba.",
     "From" : "Dende:",
     "Select account" : "Seleccione unha conta",
     "To" : "Para",
@@ -208,6 +209,7 @@ OC.L10N.register(
     "Sieve Security" : "Peneira de seguridade",
     "Sieve Port" : "Porto da peneira",
     "Sieve Credentials" : "Credenciais da peneira",
+    "IMAP Credentials" : "Credenciais IMAP",
     "Custom" : "Personalizado",
     "Sieve User" : "Usuario da peneira",
     "Sieve Password" : "Contrasinal da peneira",
diff --git a/l10n/gl.json b/l10n/gl.json
index 809285becd153ce6246444130b115d1c6a81682f..808cdde0d8641a4d46b1fdac5a60a8bb1d3400c1 100644
--- a/l10n/gl.json
+++ b/l10n/gl.json
@@ -52,6 +52,7 @@
     "Register as application for mail links" : "Rexistre como aplicación para ligazóns de correo",
     "Show keyboard shortcuts" : "Amosar os atallos de teclado",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Permitirlle á aplicación recoller datos sobre as súas interaccións. A partir destes datos, a aplicación adaptarase ás súas preferencias. Os datos só se almacenarán localmente.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Colocar o meu texto ao final dunha resposta no canto de enriba.",
     "From" : "Dende:",
     "Select account" : "Seleccione unha conta",
     "To" : "Para",
@@ -206,6 +207,7 @@
     "Sieve Security" : "Peneira de seguridade",
     "Sieve Port" : "Porto da peneira",
     "Sieve Credentials" : "Credenciais da peneira",
+    "IMAP Credentials" : "Credenciais IMAP",
     "Custom" : "Personalizado",
     "Sieve User" : "Usuario da peneira",
     "Sieve Password" : "Contrasinal da peneira",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 5083d6b118dae9c9d140cffc4780a88f01615058..7eb6d2e5b13ac6b6cc53bcda76de0795a935749e 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Creating account failed: " : "Paskyros sukūrimas nepavyko: ",
     "Embedded message %s" : "Įterptas laiškas %s",
     "Important mail" : "Svarbūs laiškai",
+    "Unread mail" : "Neskaitytas paštas",
     "Mails" : "El. laiškai",
     "Mail" : "Paštas",
     "💌 A mail app for Nextcloud" : "💌 Pašto programėlė, skirta Nextcloud",
@@ -91,12 +92,16 @@ OC.L10N.register(
     "Draft: " : "Juodraštis: ",
     "Load more" : "Įkelti daugiau",
     "Could not delete message" : "Nepavyko ištrinti laiško",
+    "_Mark {number} unread_::_Mark {number} unread_" : ["Žymėti {number} kaip neskaitytą","Žymėti {number} kaip neskaitytus","Žymėti {number} kaip neskaitytus","Žymėti {number} kaip neskaitytą"],
+    "_Mark {number} read_::_Mark {number} read_" : ["Žymėti {number} kaip skaitytą","Žymėti {number} kaip skaitytus","Žymėti {number} kaip skaitytus","Žymėti {number} kaip skaitytą"],
+    "_Move {number}_::_Move {number}_" : ["Perkelti {number}","Perkelti {number}","Perkelti {number}","Perkelti {number}"],
     "_Delete {number}_::_Delete {number}_" : ["IÅ¡trinti {number}","IÅ¡trinti {number}","IÅ¡trinti {number}","IÅ¡trinti {number}"],
     "Report this bug" : "Pranešti apie šią klaidą",
     "Could not open mailbox" : "Nepavyko atverti pašto dėžutės",
     "Loading messages" : "Įkeliami laiškai",
     "Indexing your messages. This can take a bit longer for larger mailboxes." : "Indeksuojami jūsų laiškai. Didelėse pašto dėžutėse tai gali užtrukti šiek tiek ilgiau.",
     "Choose" : "Pasirinkite",
+    "Important and unread" : "Svarbūs ir neskaityti",
     "Important info" : "Svarbi informacija",
     "Favorites" : "MÄ—gstami",
     "Other" : "Kita",
@@ -158,6 +163,8 @@ OC.L10N.register(
     "Could not load your draft" : "Nepavyko įkelti jūsų juodraščio",
     "Could not load original message" : "Nepavyko įkelti pradinio laiško",
     "No message selected" : "Nepasirinktas joks laiškas",
+    "Disabled" : "IÅ¡jungta",
+    "Enabled" : "Įjungta",
     "Signature …" : "Parašas…",
     "Save signature" : "Įrašyti parašą",
     "Reply" : "Atsakyti",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 58c2b443537cb0c7c1a2c467313224308c15a340..544fe144bed4298336755e772a50c7fa72e7857b 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -4,6 +4,7 @@
     "Creating account failed: " : "Paskyros sukūrimas nepavyko: ",
     "Embedded message %s" : "Įterptas laiškas %s",
     "Important mail" : "Svarbūs laiškai",
+    "Unread mail" : "Neskaitytas paštas",
     "Mails" : "El. laiškai",
     "Mail" : "Paštas",
     "💌 A mail app for Nextcloud" : "💌 Pašto programėlė, skirta Nextcloud",
@@ -89,12 +90,16 @@
     "Draft: " : "Juodraštis: ",
     "Load more" : "Įkelti daugiau",
     "Could not delete message" : "Nepavyko ištrinti laiško",
+    "_Mark {number} unread_::_Mark {number} unread_" : ["Žymėti {number} kaip neskaitytą","Žymėti {number} kaip neskaitytus","Žymėti {number} kaip neskaitytus","Žymėti {number} kaip neskaitytą"],
+    "_Mark {number} read_::_Mark {number} read_" : ["Žymėti {number} kaip skaitytą","Žymėti {number} kaip skaitytus","Žymėti {number} kaip skaitytus","Žymėti {number} kaip skaitytą"],
+    "_Move {number}_::_Move {number}_" : ["Perkelti {number}","Perkelti {number}","Perkelti {number}","Perkelti {number}"],
     "_Delete {number}_::_Delete {number}_" : ["IÅ¡trinti {number}","IÅ¡trinti {number}","IÅ¡trinti {number}","IÅ¡trinti {number}"],
     "Report this bug" : "Pranešti apie šią klaidą",
     "Could not open mailbox" : "Nepavyko atverti pašto dėžutės",
     "Loading messages" : "Įkeliami laiškai",
     "Indexing your messages. This can take a bit longer for larger mailboxes." : "Indeksuojami jūsų laiškai. Didelėse pašto dėžutėse tai gali užtrukti šiek tiek ilgiau.",
     "Choose" : "Pasirinkite",
+    "Important and unread" : "Svarbūs ir neskaityti",
     "Important info" : "Svarbi informacija",
     "Favorites" : "MÄ—gstami",
     "Other" : "Kita",
@@ -156,6 +161,8 @@
     "Could not load your draft" : "Nepavyko įkelti jūsų juodraščio",
     "Could not load original message" : "Nepavyko įkelti pradinio laiško",
     "No message selected" : "Nepasirinktas joks laiškas",
+    "Disabled" : "IÅ¡jungta",
+    "Enabled" : "Įjungta",
     "Signature …" : "Parašas…",
     "Save signature" : "Įrašyti parašą",
     "Reply" : "Atsakyti",
diff --git a/l10n/nl.js b/l10n/nl.js
index ac34060940d1cef91e04f5cf415b1f7f41731ded..2df8efe61f6ac10f01195de0fdd834e854ebafa5 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Register as application for mail links" : "Registreer als applicatie voor e-maillinks",
     "Show keyboard shortcuts" : "Toon sneltoetsen",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Laat de app gegevens verzamelen over jouw interacties. Op basis van deze gegevens zal de app zich aanpassen aan je voorkeuren. De gegevens worden alleen lokaal opgeslagen.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Zet mijn tekst onderaan een antwoord in plaats van erboven.",
     "From" : "Van",
     "Select account" : "Selecteer account",
     "To" : "Naar",
@@ -208,6 +209,7 @@ OC.L10N.register(
     "Sieve Security" : "Sieve Security",
     "Sieve Port" : "Sieve poort",
     "Sieve Credentials" : "Sieve inloggegevens",
+    "IMAP Credentials" : "IMAP inloggegevens",
     "Custom" : "Maatwerk",
     "Sieve User" : "Sieve gebruiker",
     "Sieve Password" : "Sieve Wachtwoord",
diff --git a/l10n/nl.json b/l10n/nl.json
index 3f1fcd75eafea165666d2f9cd11bacdd1493fa8f..cd82bd7acd92a7e10173f8c853b9f65c200e3bf8 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -52,6 +52,7 @@
     "Register as application for mail links" : "Registreer als applicatie voor e-maillinks",
     "Show keyboard shortcuts" : "Toon sneltoetsen",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Laat de app gegevens verzamelen over jouw interacties. Op basis van deze gegevens zal de app zich aanpassen aan je voorkeuren. De gegevens worden alleen lokaal opgeslagen.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Zet mijn tekst onderaan een antwoord in plaats van erboven.",
     "From" : "Van",
     "Select account" : "Selecteer account",
     "To" : "Naar",
@@ -206,6 +207,7 @@
     "Sieve Security" : "Sieve Security",
     "Sieve Port" : "Sieve poort",
     "Sieve Credentials" : "Sieve inloggegevens",
+    "IMAP Credentials" : "IMAP inloggegevens",
     "Custom" : "Maatwerk",
     "Sieve User" : "Sieve gebruiker",
     "Sieve Password" : "Sieve Wachtwoord",
diff --git a/l10n/oc.js b/l10n/oc.js
index 0a6fd1a5833224b679db76950e097d3ccaf4dfd5..6f0f7443aa6c022d911cb9409b68383e43344513 100644
--- a/l10n/oc.js
+++ b/l10n/oc.js
@@ -8,6 +8,8 @@ OC.L10N.register(
     "Mail Address" : "Adreça mail",
     "Password" : "Senhal",
     "None" : "Pas cap",
+    "IMAP Password" : "Senhal IMAP",
+    "SMTP Password" : "Senhal SMTP",
     "Save" : "Salvar",
     "Connect" : "Connectar",
     "Write message …" : "Escriure un messatge…",
diff --git a/l10n/oc.json b/l10n/oc.json
index 659a08efe421bef9f2a32cef2699d07dce8a3353..c7f6900872af88d80a02d0ee15549d5809b3c865 100644
--- a/l10n/oc.json
+++ b/l10n/oc.json
@@ -6,6 +6,8 @@
     "Mail Address" : "Adreça mail",
     "Password" : "Senhal",
     "None" : "Pas cap",
+    "IMAP Password" : "Senhal IMAP",
+    "SMTP Password" : "Senhal SMTP",
     "Save" : "Salvar",
     "Connect" : "Connectar",
     "Write message …" : "Escriure un messatge…",
diff --git a/l10n/pl.js b/l10n/pl.js
index 99e17a7c4bfff46cc727294a27b5fad10b85e959..534ab77d340f7d7b29c2987d64eebcf3151bfe94 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Register as application for mail links" : "Zarejestruj się jako aplikacja do linków pocztowych",
     "Show keyboard shortcuts" : "Pokaż skróty klawiaturowe",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Zezwól aplikacji na zbieranie danych o Twoich interakcjach. Na podstawie tych danych aplikacja dostosuje się do Twoich preferencji. Dane będą przechowywane tylko lokalnie.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Umieść mój tekst na dole odpowiedzi, zamiast nad nią.",
     "From" : "Od",
     "Select account" : "Wybierz konto",
     "To" : "Do",
@@ -208,6 +209,7 @@ OC.L10N.register(
     "Sieve Security" : "Bezpieczeństwo Sieve",
     "Sieve Port" : "Port Sieve",
     "Sieve Credentials" : "Poświadczenia Sieve",
+    "IMAP Credentials" : "Poświadczenia IMAP",
     "Custom" : "Dowolnie",
     "Sieve User" : "Użytkownik Sieve",
     "Sieve Password" : "Hasło Sieve",
diff --git a/l10n/pl.json b/l10n/pl.json
index 0a04c71d899e783c0f6846b0c6dc0f873d1ae1aa..ddbb0b6cce4ebdc073e675563310e16a5dd19a14 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -52,6 +52,7 @@
     "Register as application for mail links" : "Zarejestruj się jako aplikacja do linków pocztowych",
     "Show keyboard shortcuts" : "Pokaż skróty klawiaturowe",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Zezwól aplikacji na zbieranie danych o Twoich interakcjach. Na podstawie tych danych aplikacja dostosuje się do Twoich preferencji. Dane będą przechowywane tylko lokalnie.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Umieść mój tekst na dole odpowiedzi, zamiast nad nią.",
     "From" : "Od",
     "Select account" : "Wybierz konto",
     "To" : "Do",
@@ -206,6 +207,7 @@
     "Sieve Security" : "Bezpieczeństwo Sieve",
     "Sieve Port" : "Port Sieve",
     "Sieve Credentials" : "Poświadczenia Sieve",
+    "IMAP Credentials" : "Poświadczenia IMAP",
     "Custom" : "Dowolnie",
     "Sieve User" : "Użytkownik Sieve",
     "Sieve Password" : "Hasło Sieve",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 2d813ea4f626eba60f16f26435ddc00718507395..fde6dcee5adfdeb5811318c90b47f378f36fb68d 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Register as application for mail links" : "Registrar como aplicativo para links de correio",
     "Show keyboard shortcuts" : "Mostrar atalhos de teclado",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Permitir que o aplicativo colete dados sobre suas interações. Com base nisso, o aplicativo se adaptará às suas preferências. Os dados serão armazenados apenas localmente.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Coloque meu texto no final de uma resposta, em vez de no topo dela.",
     "From" : "De",
     "Select account" : "Selecionar conta",
     "To" : "Para",
@@ -208,6 +209,7 @@ OC.L10N.register(
     "Sieve Security" : "Segurança do Sieve",
     "Sieve Port" : "Porta Sieve",
     "Sieve Credentials" : "Credenciais Sieve",
+    "IMAP Credentials" : "Credenciais IMAP",
     "Custom" : "Personalizado",
     "Sieve User" : "Usuário Sieve",
     "Sieve Password" : "Senha Sieve",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 61bda3e5b553bf11c684ce88365d7ed453d047b4..9bfa13084fb382fc03551c2b8143592ce57ff2a7 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -52,6 +52,7 @@
     "Register as application for mail links" : "Registrar como aplicativo para links de correio",
     "Show keyboard shortcuts" : "Mostrar atalhos de teclado",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "Permitir que o aplicativo colete dados sobre suas interações. Com base nisso, o aplicativo se adaptará às suas preferências. Os dados serão armazenados apenas localmente.",
+    "Put my text to the bottom of a reply instead of on top of it." : "Coloque meu texto no final de uma resposta, em vez de no topo dela.",
     "From" : "De",
     "Select account" : "Selecionar conta",
     "To" : "Para",
@@ -206,6 +207,7 @@
     "Sieve Security" : "Segurança do Sieve",
     "Sieve Port" : "Porta Sieve",
     "Sieve Credentials" : "Credenciais Sieve",
+    "IMAP Credentials" : "Credenciais IMAP",
     "Custom" : "Personalizado",
     "Sieve User" : "Usuário Sieve",
     "Sieve Password" : "Senha Sieve",
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 05db1fc142495ecefeb8928668dff138ead5a7da..6d8558e7559b88ce9bff0091140b2660684b9694 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Register as application for mail links" : "注册为邮件链接应用",
     "Show keyboard shortcuts" : "显示键盘快捷方式",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "允许该应用收集有关您的互动的数据。 根据这些数据，该应用程序将适应您的偏好。 数据将仅存储在本地。",
+    "Put my text to the bottom of a reply instead of on top of it." : "把我的信息放在回复的最下面，而不是最上面。 ",
     "From" : "发件人",
     "Select account" : "选择账号",
     "To" : "收件人",
@@ -208,6 +209,7 @@ OC.L10N.register(
     "Sieve Security" : "Sieve 安全性",
     "Sieve Port" : "Sieve 端口",
     "Sieve Credentials" : "Sieve 凭据",
+    "IMAP Credentials" : "IMAP 凭据",
     "Custom" : "自定义",
     "Sieve User" : "Sieve 用户",
     "Sieve Password" : "Sieve 密码",
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 979adab3b937186d2d3a2bf7147e9fe553841c06..e921ea4a49c1298d0a6695fcff1b12cdf20d493b 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -52,6 +52,7 @@
     "Register as application for mail links" : "注册为邮件链接应用",
     "Show keyboard shortcuts" : "显示键盘快捷方式",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "允许该应用收集有关您的互动的数据。 根据这些数据，该应用程序将适应您的偏好。 数据将仅存储在本地。",
+    "Put my text to the bottom of a reply instead of on top of it." : "把我的信息放在回复的最下面，而不是最上面。 ",
     "From" : "发件人",
     "Select account" : "选择账号",
     "To" : "收件人",
@@ -206,6 +207,7 @@
     "Sieve Security" : "Sieve 安全性",
     "Sieve Port" : "Sieve 端口",
     "Sieve Credentials" : "Sieve 凭据",
+    "IMAP Credentials" : "IMAP 凭据",
     "Custom" : "自定义",
     "Sieve User" : "Sieve 用户",
     "Sieve Password" : "Sieve 密码",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index a931de093d628e5c54d4e17de179fab97c975fd6..646f681b3457d8e782608ac32fe94d30596afe40 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -45,6 +45,8 @@ OC.L10N.register(
     "Default folders" : "預設資料夾",
     "The folders to use for drafts, sent messages and deleted messages." : "用於草稿、寄件備份與已刪除郵件要使用的資料夾。",
     "Mail server" : "郵件伺服器",
+    "Sieve filter server" : "過濾伺服器",
+    "Sieve filter rules" : "過濾規則",
     "Trusted senders" : "信任的寄件者",
     "Add alias" : "新增別名",
     "Add mail account" : "新增郵件帳號",
@@ -52,6 +54,7 @@ OC.L10N.register(
     "Register as application for mail links" : "註冊為郵件連結的處理應用程式",
     "Show keyboard shortcuts" : "顯示鍵盤快捷鍵",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "允許應用程式蒐集關於您互動的資料。以此資料為基礎，應用程式將會適應您的偏好設定。資料將只會儲存在本機。",
+    "Put my text to the bottom of a reply instead of on top of it." : "將我的文字放在回覆的底部而非頂部。",
     "From" : "從",
     "Select account" : "選取帳號",
     "To" : "至",
@@ -157,6 +160,8 @@ OC.L10N.register(
     "Choose a folder to store the attachments in" : "選擇一個資料夾來存放附件",
     "This message is encrypted with PGP. Install Mailvelope to decrypt it." : "此郵件使用 PGP 加密。安裝 Mailvelope 來解密。",
     "The images have been blocked to protect your privacy." : "為維護您的隱私，圖片將不會被載入。",
+    "Always show images from {sender}" : "一律顯示來自 {sender} 的圖片",
+    "Always show images from {domain}" : "一律顯示來自 {domain} 的圖片",
     "Message frame" : "郵件框",
     "Quoted text" : "引用文字",
     "Moving" : "正在移動",
@@ -198,6 +203,19 @@ OC.L10N.register(
     "Could not load your draft" : "無法載入您的草稿",
     "Could not load original message" : "無法載入原始郵件",
     "No message selected" : "未選取郵件",
+    "Disabled" : "已停用",
+    "Enabled" : "已啟用",
+    "Sieve Host" : "過濾主機",
+    "Sieve Security" : "過濾安全",
+    "Sieve Port" : "過濾連接埠",
+    "Sieve Credentials" : "過濾憑證",
+    "IMAP Credentials" : "IMAP 憑證",
+    "Custom" : "自訂",
+    "Sieve User" : "過濾使用者",
+    "Sieve Password" : "過濾密碼",
+    "Oh Snap!" : "喔喔！",
+    "Save sieve settings" : "儲存過濾設定",
+    "Save sieve script" : "儲存過濾指令稿",
     "Signature …" : "簽名……",
     "Save signature" : "儲存簽名",
     "Could not load your message thread" : "無法載入您的郵件串",
@@ -205,6 +223,8 @@ OC.L10N.register(
     "Remove" : "移除",
     "No senders are trusted at the moment." : "目前沒有寄件者受到信任。",
     "Could not remove trusted sender {sender}" : "無法移除受信任的寄件者 {sender}",
+    "individual" : "個人",
+    "domain" : "網域",
     "Import into {calendar}" : "已匯入至 {calendar}",
     "Event imported into {calendar}" : "活動已匯入至 {calendar}",
     "Could not create event" : "無法建立活動",
@@ -220,6 +240,7 @@ OC.L10N.register(
     "Email: {email}" : "電子郵件：{email}",
     "IMAP: {user} on {host}:{port} ({ssl} encryption)" : "IMAP：{user} 在 {host}:{port}（{ssl} 加密）",
     "SMTP: {user} on {host}:{port} ({ssl} encryption)" : "SMTP：{user} 在 {host}:{port}（{ssl} 加密）",
+    "Sieve: {user} on {host}:{port} ({ssl} encryption)" : "過濾：{user} 在 {host}:{port}（{ssl} 加密）",
     "You can configure a template for account settings, from which all users will get an account provisioned from." : "您可以為帳號設定建立範本，所有使用者都可以從其中取得預先設定好的帳號。",
     "Provision an account for every user" : "為每個使用者設定一個帳號",
     "General" : "一般",
@@ -229,6 +250,8 @@ OC.L10N.register(
     "Host" : "主機",
     "Port" : "連接埠",
     "SMTP" : "SMTP",
+    "Sieve" : "過濾",
+    "Enable sieve integration" : "啟用過濾整合",
     "Apply and create/update for all users" : "為所有使用者套用並建立／更新",
     "Disable and un-provision existing accounts" : "停用並取消設定現有帳號",
     "With the settings above, the app will create account settings in the following way:" : "使用上述設定，應用程式將會以下列方式建立帳號：",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 4a5bd86ca5a819caf537d6cd2708be8cdf13fd3b..08b9dec2dba4470fc6adfaeb9b8e06e03564e345 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -43,6 +43,8 @@
     "Default folders" : "預設資料夾",
     "The folders to use for drafts, sent messages and deleted messages." : "用於草稿、寄件備份與已刪除郵件要使用的資料夾。",
     "Mail server" : "郵件伺服器",
+    "Sieve filter server" : "過濾伺服器",
+    "Sieve filter rules" : "過濾規則",
     "Trusted senders" : "信任的寄件者",
     "Add alias" : "新增別名",
     "Add mail account" : "新增郵件帳號",
@@ -50,6 +52,7 @@
     "Register as application for mail links" : "註冊為郵件連結的處理應用程式",
     "Show keyboard shortcuts" : "顯示鍵盤快捷鍵",
     "Allow the app to collect data about your interactions. Based on this data, the app will adapt to your preferences. The data will only be stored locally." : "允許應用程式蒐集關於您互動的資料。以此資料為基礎，應用程式將會適應您的偏好設定。資料將只會儲存在本機。",
+    "Put my text to the bottom of a reply instead of on top of it." : "將我的文字放在回覆的底部而非頂部。",
     "From" : "從",
     "Select account" : "選取帳號",
     "To" : "至",
@@ -155,6 +158,8 @@
     "Choose a folder to store the attachments in" : "選擇一個資料夾來存放附件",
     "This message is encrypted with PGP. Install Mailvelope to decrypt it." : "此郵件使用 PGP 加密。安裝 Mailvelope 來解密。",
     "The images have been blocked to protect your privacy." : "為維護您的隱私，圖片將不會被載入。",
+    "Always show images from {sender}" : "一律顯示來自 {sender} 的圖片",
+    "Always show images from {domain}" : "一律顯示來自 {domain} 的圖片",
     "Message frame" : "郵件框",
     "Quoted text" : "引用文字",
     "Moving" : "正在移動",
@@ -196,6 +201,19 @@
     "Could not load your draft" : "無法載入您的草稿",
     "Could not load original message" : "無法載入原始郵件",
     "No message selected" : "未選取郵件",
+    "Disabled" : "已停用",
+    "Enabled" : "已啟用",
+    "Sieve Host" : "過濾主機",
+    "Sieve Security" : "過濾安全",
+    "Sieve Port" : "過濾連接埠",
+    "Sieve Credentials" : "過濾憑證",
+    "IMAP Credentials" : "IMAP 憑證",
+    "Custom" : "自訂",
+    "Sieve User" : "過濾使用者",
+    "Sieve Password" : "過濾密碼",
+    "Oh Snap!" : "喔喔！",
+    "Save sieve settings" : "儲存過濾設定",
+    "Save sieve script" : "儲存過濾指令稿",
     "Signature …" : "簽名……",
     "Save signature" : "儲存簽名",
     "Could not load your message thread" : "無法載入您的郵件串",
@@ -203,6 +221,8 @@
     "Remove" : "移除",
     "No senders are trusted at the moment." : "目前沒有寄件者受到信任。",
     "Could not remove trusted sender {sender}" : "無法移除受信任的寄件者 {sender}",
+    "individual" : "個人",
+    "domain" : "網域",
     "Import into {calendar}" : "已匯入至 {calendar}",
     "Event imported into {calendar}" : "活動已匯入至 {calendar}",
     "Could not create event" : "無法建立活動",
@@ -218,6 +238,7 @@
     "Email: {email}" : "電子郵件：{email}",
     "IMAP: {user} on {host}:{port} ({ssl} encryption)" : "IMAP：{user} 在 {host}:{port}（{ssl} 加密）",
     "SMTP: {user} on {host}:{port} ({ssl} encryption)" : "SMTP：{user} 在 {host}:{port}（{ssl} 加密）",
+    "Sieve: {user} on {host}:{port} ({ssl} encryption)" : "過濾：{user} 在 {host}:{port}（{ssl} 加密）",
     "You can configure a template for account settings, from which all users will get an account provisioned from." : "您可以為帳號設定建立範本，所有使用者都可以從其中取得預先設定好的帳號。",
     "Provision an account for every user" : "為每個使用者設定一個帳號",
     "General" : "一般",
@@ -227,6 +248,8 @@
     "Host" : "主機",
     "Port" : "連接埠",
     "SMTP" : "SMTP",
+    "Sieve" : "過濾",
+    "Enable sieve integration" : "啟用過濾整合",
     "Apply and create/update for all users" : "為所有使用者套用並建立／更新",
     "Disable and un-provision existing accounts" : "停用並取消設定現有帳號",
     "With the settings above, the app will create account settings in the following way:" : "使用上述設定，應用程式將會以下列方式建立帳號：",