diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index ab46130ac..d72cf1a04 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -99,9 +99,15 @@ export class MessageModel extends AbstractModel {
 
 			isUnseen: () => !this.flags().includes('\\seen'),
 			isFlagged: () => this.flags().includes('\\flagged'),
-			isReadReceipt: () => this.flags().includes('$mdnsent')
+			isReadReceipt: () => this.flags().includes('$mdnsent'),
 //			isJunk: () => this.flags().includes('$junk') && !this.flags().includes('$nonjunk'),
-//			isPhishing: () => this.flags().includes('$phishing')
+//			isPhishing: () => this.flags().includes('$phishing'),
+
+			tags: () => this.flags().map(value =>
+					('\\' == value[0] || '$forwarded' == value)
+					? ''
+					: '<span class="msgflag-'+value+'">' + i18n('MESSAGE_TAGS/'+value,0,value) + '</span>'
+				).join(' ')
 		});
 	}
 
@@ -299,7 +305,7 @@ export class MessageModel extends AbstractModel {
 			hasUnseenSubMessage: this.hasUnseenSubMessage(),
 			hasFlaggedSubMessage: this.hasFlaggedSubMessage()
 		}, (key, value) => value && classes.push(key));
-		this.flags().forEach(value => classes.push('flag-'+value));
+		this.flags().forEach(value => classes.push('msgflag-'+value));
 		return classes.join(' ');
 	}
 
diff --git a/dev/Styles/@Main.less b/dev/Styles/@Main.less
index be381df6c..9ef3f2ada 100644
--- a/dev/Styles/@Main.less
+++ b/dev/Styles/@Main.less
@@ -36,6 +36,7 @@
 @import "User/Identity.less";
 @import "User/AdvancedSearch.less";
 @import "User/Attachments.less";
+@import "User/MessageFlags.less";
 @import "User/MessageList.less";
 @import "User/MessageView.less";
 @import "User/Contacts.less";
diff --git a/dev/Styles/User/MessageFlags.less b/dev/Styles/User/MessageFlags.less
new file mode 100644
index 000000000..3ca268f90
--- /dev/null
+++ b/dev/Styles/User/MessageFlags.less
@@ -0,0 +1,26 @@
+/* RFC8457 */
+.msgflag-\$important .checkboxMessage { background-color: #F00; color: #fff; }
+.msgflag-\$important.focused { background-color: rgba(255,   0,   0, 0.30); }
+.msgflag-\$important:not(.focused) { color: #F00; }
+
+/* KMail tags */
+.msgflag-\$todo .checkboxMessage { background-color: #00F; color: #fff; }
+.msgflag-\$todo.focused { background-color: rgba( 64,  64, 255, 0.30); }
+.msgflag-\$todo:not(.focused) { color: #33F; }
+
+/* Thunderbird labels */
+.msgflag-\$label5 .checkboxMessage { background-color: #808; color: #fff; }
+.msgflag-\$label4 .checkboxMessage { background-color: #00F; color: #fff; }
+.msgflag-\$label3 .checkboxMessage { background-color: #080; color: #fff; }
+.msgflag-\$label2 .checkboxMessage { background-color: #FA0; color: #fff; }
+.msgflag-\$label1 .checkboxMessage { background-color: #F00; color: #fff; }
+.msgflag-\$label5.focused { background-color: rgba(255,   0, 255, 0.30); }
+.msgflag-\$label4.focused { background-color: rgba( 64,  64, 255, 0.30); }
+.msgflag-\$label3.focused { background-color: rgba(  0, 255,   0, 0.30); }
+.msgflag-\$label2.focused { background-color: rgba(255, 170,   0, 0.30); }
+.msgflag-\$label1.focused { background-color: rgba(255,   0,   0, 0.30); }
+.msgflag-\$label5:not(.focused) { color: #939; }
+.msgflag-\$label4:not(.focused) { color: #33F; }
+.msgflag-\$label3:not(.focused) { color: #090; }
+.msgflag-\$label2:not(.focused) { color: #F90; }
+.msgflag-\$label1:not(.focused) { color: #F00; }
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index 17e7795f9..9bb6d0fa5 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -216,13 +216,6 @@ html:not(rl-mobile) {
 		margin-right:5px
 	}
 
-	&.flag-\\deleted {
-		opacity: .7;
-		.subjectParent {
-			text-decoration: line-through;
-		}
-	}
-
 	&.deleted {
 		opacity: .3;
 	}
@@ -341,14 +334,33 @@ html:not(rl-mobile) {
 	.flagParent::after {
 		content: '☆'; /*⚐*/
 	}
-	&.flag-\\flagged .flagParent::after,
+	&.msgflag-\\flagged .flagParent::after,
 	&.hasFlaggedSubMessage .flagParent::after {
 		color: orange;
 		content: '★'; /*⚑*/
 	}
-	&:not(.flag-\\flagged):not(.hasFlaggedSubMessage) .flagParent:not(:hover) {
+	&:not(.msgflag-\\flagged):not(.hasFlaggedSubMessage) .flagParent:not(:hover) {
 		opacity: 0.5;
 	}
+
+	.senderParent::before {
+		font-family: snappymail;
+	}
+	&.msgflag-\\answered .senderParent::before {
+		content: '← ';
+	}
+	&.msgflag-\$forwarded .senderParent::before {
+		content: '→ ';
+	}
+	&.msgflag-\\answered.msgflag-\$forwarded .senderParent::before {
+		content: '←→ ';
+	}
+	&.msgflag-\\deleted {
+		opacity: .7;
+		.subjectParent {
+			text-decoration: line-through;
+		}
+	}
 }
 
 html.rl-ctrl-key-pressed .messageListItem {
@@ -442,35 +454,3 @@ html:not(.rl-mobile):not(.rl-side-preview-pane) {
 		}
 	}
 }
-
-.senderParent::before {
-	font-family: snappymail;
-}
-.flag-\\answered .senderParent::before {
-	content: '← ';
-}
-.flag-\$forwarded .senderParent::before {
-	content: '→ ';
-}
-.flag-\\answered.flag-\$forwarded .senderParent::before {
-	content: '←→ ';
-}
-
-/* Thunderbird labels */
-/*
-.flag-\$label5 .checkboxMessage { background-color: #808; }
-.flag-\$label4 .checkboxMessage { background-color: #00F; }
-.flag-\$label3 .checkboxMessage { background-color: #080; }
-.flag-\$label2 .checkboxMessage { background-color: #FA0; }
-.flag-\$label1 .checkboxMessage { background-color: #F00; }
-*/
-.messageListItem.flag-\$label5.focused { background-color: rgba(255,   0, 255, 0.30); }
-.messageListItem.flag-\$label4.focused { background-color: rgba( 64,  64, 255, 0.30); }
-.messageListItem.flag-\$label3.focused { background-color: rgba(  0, 255,   0, 0.30); }
-.messageListItem.flag-\$label2.focused { background-color: rgba(255, 170,   0, 0.30); }
-.messageListItem.flag-\$label1.focused { background-color: rgba(255,   0,   0, 0.30); }
-.messageListItem.flag-\$label5:not(.focused) { color: #939; }
-.messageListItem.flag-\$label4:not(.focused) { color: #33F; }
-.messageListItem.flag-\$label3:not(.focused) { color: #090; }
-.messageListItem.flag-\$label2:not(.focused) { color: #F90; }
-.messageListItem.flag-\$label1:not(.focused) { color: #F00; }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
index c42865ed8..e8539d377 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
@@ -27,9 +27,13 @@ abstract class MessageFlag
 		FLAGGED = '\\Flagged',
 		ANSWERED = '\\Answered',
 		DRAFT = '\\Draft',
-		// https://datatracker.ietf.org/doc/html/rfc9051#section-2.3.2
-		FORWARDED = '$Forwarded',
+		// https://datatracker.ietf.org/doc/html/rfc3503
 		MDNSENT = '$MDNSent',
+		// https://datatracker.ietf.org/doc/html/rfc8457
+		DRAFT = '$Important',
+		// https://datatracker.ietf.org/doc/html/rfc5788
+		FORWARDED = '$Forwarded',
+		// https://datatracker.ietf.org/doc/html/rfc9051#section-2.3.2
 		JUNK = '$Junk',
 		NOTJUNK = '$NotJunk',
 		PHISHING = '$Phishing';
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index 5edba72ab..3ffcb4e4d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -639,6 +639,14 @@ class Message implements \JsonSerializable
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
+/*
+		// JMAP-only RFC8621 keywords (RFC5788)
+		$keywords = \array_fill_keys(\str_replace(
+			['\\draft', '\\seen', '\\flagged', '\\answered'],
+			[ '$draft',  '$seen',  '$flagged',  '$answered'],
+			$this->aFlagsLowerCase
+		), true);
+*/
 		return array(
 			'@Object' => 'Object/Message',
 			'Folder' => $this->sFolder,
@@ -675,7 +683,7 @@ class Message implements \JsonSerializable
 //			'blobId' => $this->sEmailIdBlob,
 			'threadId' => $this->sThreadId,
 //			'mailboxIds' => ['mailboxid'=>true],
-//			'keywords' => \array_fill_keys($this->aFlagsLowerCase, true),
+//			'keywords' => $keywords,
 			'size' => $this->iSize,
 			'receivedAt' => \gmdate('Y-m-d\\TH:i:s\\Z', $this->iInternalTimeStampInUTC)
 		);
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
index adbec8eb9..6a705ccfa 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "zip تنزيل كـ",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "إعلام بالقراءة (تم عرضها) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
index acb759611..c3cf5cdea 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Изберете цел от папките в лявото поле",
 		"LINK_DOWNLOAD_AS_ZIP": "Свали като ZIP файл",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Обратна разписка (видяно) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
index 1d4b721f5..0518967da 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Vyberte cílovou složku v levém panelu.",
 		"LINK_DOWNLOAD_AS_ZIP": "Stáhnout jako zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Potvrzení o zobrazení zprávy - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json
index da2eda87a..c7fbed339 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Vælg modtagemappe i panelet til venstre.",
 		"LINK_DOWNLOAD_AS_ZIP": "Hent som zip-fil",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Kvittering for læsning af - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json
index 241d8a3f7..50d522511 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Klicke auf den Ordnernamen auf der linken Seite, um die Nachricht zu verschieben.",
 		"LINK_DOWNLOAD_AS_ZIP": "Als ZIP-Datei herunterladen",
 		"SPAM_SCORE": "Spam-Score",
-		"HAS_VIRUS_WARNING": "WARNUNG: Virus erkannt"
+		"HAS_VIRUS_WARNING": "WARNUNG: Virus erkannt",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Empfangsbestätigung (angezeigt) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json
index a680d1361..05d1675cf 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Μεταφόρτωση σαν zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Αποδεικτικό Ανάγνωσης (παρουσιάστηκε) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index b0c303c4d..f3eb4aa14 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json
index 787fde9aa..2745256db 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Haga clic en el nombre de la carpeta del panel izquierdo para seleccionar el destino.",
 		"LINK_DOWNLOAD_AS_ZIP": "Descargar todo (archivo ZIP)",
 		"SPAM_SCORE": "Puntuación de spam",
-		"HAS_VIRUS_WARNING": "ADVERTENCIA: virus detectado"
+		"HAS_VIRUS_WARNING": "ADVERTENCIA: virus detectado",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Acuse de recibo (se visualiza) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json
index f3b24de3f..e0a1d3971 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Laadi alla .zip failina",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Kohaletoimetamise kinnitus - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
index f1a6d727a..191b9784e 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "بر روی نام شاخه در پنل سمت راست جهت انتخاب مقصد کلیک کنید",
 		"LINK_DOWNLOAD_AS_ZIP": "دریافت با پسوند zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "برگرداندن گیرنده (نمایش داده شد) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
index f1c49729c..181c58ba0 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Lataa zip-tiedostona",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Kuitattu luetuksi - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
index 3fecc8ae3..ef4b94cbe 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Cliquez sur le nom du dossier dans le panneau de gauche pour sélectionner la destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Télécharger le zip",
 		"SPAM_SCORE": "Score de spam",
-		"HAS_VIRUS_WARNING": "ATTENTION : virus détecté"
+		"HAS_VIRUS_WARNING": "ATTENTION : virus détecté",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Accusé de réception (affiché) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
index afb6f3ffb..fbd7cb672 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "A cél kiválasztásához a bal oldali panelen kattints a mappa nevére.",
 		"LINK_DOWNLOAD_AS_ZIP": "Letöltés zip fájlként",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "FIGYELEM: vírust észleltünk"
+		"HAS_VIRUS_WARNING": "FIGYELEM: vírust észleltünk",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Visszaigazolás (megjelenítve) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json
index 6296a12d1..71e1815ff 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Klik pada nama folder pada panel kiri untuk memilih tujuan.",
 		"LINK_DOWNLOAD_AS_ZIP": "Unduh sebagai berkas zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Tanda terima (ditampilkan) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json
index 11989ed3a..19c04c24e 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Smelltu á heiti möppu á spjaldinu til vinstri til að velja áfangastaðinn.",
 		"LINK_DOWNLOAD_AS_ZIP": "Sækja sem .zip skrá",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Móttökukvittun (birt) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json
index 321a1049e..87440cb3a 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Clicca sul nome della cartella nel pannello sinistro per selezionare la destinazione.",
 		"LINK_DOWNLOAD_AS_ZIP": "Scarica come archivio ZIP",
 		"SPAM_SCORE": "Punteggio Spam",
-		"HAS_VIRUS_WARNING": "AVVISO: rilevato virus"
+		"HAS_VIRUS_WARNING": "AVVISO: rilevato virus",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Avviso di lettura - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
index 074db4c65..59629611d 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "左側のパネルでフォルダ名をクリックして移動先を選択します。",
 		"LINK_DOWNLOAD_AS_ZIP": "Zip としてダウンロード",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "開封確認メッセージ - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
index e0e223cab..37ecdac35 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "왼쪽 패널에서 폴더명을 클릭하여 위치를 선택하세요.",
 		"LINK_DOWNLOAD_AS_ZIP": ".zip 파일로 다운로드",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "수신 확인 (표시됨) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
index b3b009172..c03d75587 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Kairėje pasirinkite katalogą, į kurį norite perkelti.",
 		"LINK_DOWNLOAD_AS_ZIP": "Atsisiųsti zip archyvą",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Pristatymo patvirtinimas (laiškas parodytas) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
index 6027d6f1a..1b94dbca9 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
index 374a0faf9..369418f62 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@@ -65,7 +65,7 @@
 		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "Ett nivå"
 	},
 	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Fullskjerm av/på",
+		"FULLSCREEN": "Fullskjerm av\/på",
 		"ZOOM": "Zoom inn\/ut",
 		"CLOSE": "Lukk (Esc)",
 		"GALLERY_PREV": "Forrige (venstre piltast)",
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Trykk på mappenavn i panelet til venstre for å velge mål.",
 		"LINK_DOWNLOAD_AS_ZIP": "Last ned som zip-fil",
 		"SPAM_SCORE": "Søppelvurdering",
-		"HAS_VIRUS_WARNING": "ADVARSEL: virus oppdaget"
+		"HAS_VIRUS_WARNING": "ADVARSEL: virus oppdaget",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Lesebekreftelse (meldinga er lest) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index 1aba242d6..16f3716b3 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Klik op de doel map in het linker paneel.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download als zip",
 		"SPAM_SCORE": "Spamscore",
-		"HAS_VIRUS_WARNING": "WAARSCHUWING: virus gedetecteerd"
+		"HAS_VIRUS_WARNING": "WAARSCHUWING: virus gedetecteerd",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Ontvangstbevestiging (weergegeven) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
index dab92b07f..1531e5d9e 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Kliknij nazwę folderu w lewym panelu, aby wybrać folder docelowy.",
 		"LINK_DOWNLOAD_AS_ZIP": "Pobierz jako plik zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Żądaj potwierdzenia wyświetlenia wiadomości - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index 2cacbcafb..f28a87c6b 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Clique no nome da pasta no painel esquerdo para selecionar o destino.",
 		"LINK_DOWNLOAD_AS_ZIP": "Baixar como zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Aviso de recepção (Visualizada) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
index 0a24cabac..191bad257 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Transferir em arquivo zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Recibo de leitura (apresentado) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
index f022cca18..f83d3dcf9 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Faceți clic pe numele dosarului din panoul din stânga pentru a selecta destinația.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Mesajul dumneavoastră a fost citit - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
index 42ad15545..83c6d2946 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Выберите имя папки в левой панели, чтобы переместить сообщение.",
 		"LINK_DOWNLOAD_AS_ZIP": "Сохранить как zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Уведомление о прочтении письма - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
index 25f42fa79..511cbe3e9 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Zvoľte cieľ kliknutím na názov priečinka v ľavom stĺpci.",
 		"LINK_DOWNLOAD_AS_ZIP": "Prevziať ako zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Potvrdenie o doručení (zobrazené) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
index 88b6ac298..d060b8100 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Za izbor cilja kliknite na ime mape na levi strani.",
 		"LINK_DOWNLOAD_AS_ZIP": "Prenesi kot .zip datoteko",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Povratno poročilo (prikazano) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
index 1c547e7b2..3dc1569c5 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Klicka på mapp till vänster för att välja mål mapp.",
 		"LINK_DOWNLOAD_AS_ZIP": "Ladda ner som ZIP-fil",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "VARNING: virus upptäckt"
+		"HAS_VIRUS_WARNING": "VARNING: virus upptäckt",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Mottagar kvitto (visad) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
index cee8f3669..9fa471696 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
index fe1e336eb..037ea9ba5 100644
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Завантажити як zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Сповіщення про прочитання цього повідомлення - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index b996cfadb..33253e202 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "点击左侧面板的文件夹作为目的地",
 		"LINK_DOWNLOAD_AS_ZIP": "下载为zip压缩包",
 		"SPAM_SCORE": "垃圾邮件分数",
-		"HAS_VIRUS_WARNING": "警告：检测到病毒"
+		"HAS_VIRUS_WARNING": "警告：检测到病毒",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "送达回执 - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index 4eba452b7..db386da53 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -151,7 +151,17 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 4e2548800..a740da181 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -195,6 +195,10 @@
 					</table>
 				</div>
 				<div class="hasVirus" data-bind="visible: message().hasVirus()" data-i18n="MESSAGE/HAS_VIRUS_WARNING"></div>
+				<div class="informationShort">
+					<span data-i18n="MESSAGE/TAGS"></span>:
+					<span data-bind="html: message().tags()"></span>
+				</div>
 			</div>
 			<div id="messageItem" data-bind="css: message().lineAsCss()">
 				<div tabindex="0" data-bind="hasfocus: messageDomFocused">