diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index d72cf1a04..e78859acf 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -103,10 +103,10 @@ export class MessageModel extends AbstractModel {
 //			isJunk: () => this.flags().includes('$junk') && !this.flags().includes('$nonjunk'),
 //			isPhishing: () => this.flags().includes('$phishing'),
 
-			tags: () => this.flags().map(value =>
+			tagsToHTML: () => this.flags().map(value =>
 					('\\' == value[0] || '$forwarded' == value)
 					? ''
-					: '<span class="msgflag-'+value+'">' + i18n('MESSAGE_TAGS/'+value,0,value) + '</span>'
+					: '<span class="focused msgflag-'+value+'">' + i18n('MESSAGE_TAGS/'+value,0,value) + '</span>'
 				).join(' ')
 		});
 	}
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index b39b406ff..bdbdbd5c2 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -90,6 +90,14 @@ html.rl-no-preview-pane {
 		}
 	}
 
+	.messageTags {
+		margin-top: 6px;
+	}
+	.messageTags * * {
+		border: 1px solid #808080;
+		padding: 2px;
+	}
+
 	.messageItemHeader {
 
 		background-color: #f8f8f8;
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 8349133e0..e4537ee53 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
@@ -152,16 +152,16 @@
 		"LINK_DOWNLOAD_AS_ZIP": "Als ZIP-Datei herunterladen",
 		"SPAM_SCORE": "Spam-Score",
 		"HAS_VIRUS_WARNING": "WARNUNG: Virus erkannt",
-		"TAGS": "Tags"
+		"TAGS": "Stichworte"
 	},
 	"MESSAGE_TAGS": {
-		"$important": "Important",
-		"$todo": "To Do",
-		"$label1": "Important",
-		"$label2": "Work",
-		"$label3": "Personal",
-		"$label4": "To Do",
-		"$label5": "Later"
+		"$important": "Wichtig",
+		"$todo": "Machen",
+		"$label1": "Wichtig",
+		"$label2": "Arbeit",
+		"$label3": "Persönlich",
+		"$label4": "Machen",
+		"$label5": "Später"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Empfangsbestätigung (angezeigt) - %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 ef4b94cbe..30e11adf2 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
@@ -152,16 +152,16 @@
 		"LINK_DOWNLOAD_AS_ZIP": "Télécharger le zip",
 		"SPAM_SCORE": "Score de spam",
 		"HAS_VIRUS_WARNING": "ATTENTION : virus détecté",
-		"TAGS": "Tags"
+		"TAGS": "Balises"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Important",
-		"$todo": "To Do",
+		"$todo": "Faire",
 		"$label1": "Important",
-		"$label2": "Work",
-		"$label3": "Personal",
-		"$label4": "To Do",
-		"$label5": "Later"
+		"$label2": "Travailler",
+		"$label3": "Personnel",
+		"$label4": "Faire",
+		"$label5": "Plus tard"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Accusé de réception (affiché) - %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 87440cb3a..e82319f06 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
@@ -152,16 +152,16 @@
 		"LINK_DOWNLOAD_AS_ZIP": "Scarica come archivio ZIP",
 		"SPAM_SCORE": "Punteggio Spam",
 		"HAS_VIRUS_WARNING": "AVVISO: rilevato virus",
-		"TAGS": "Tags"
+		"TAGS": "Tag"
 	},
 	"MESSAGE_TAGS": {
-		"$important": "Important",
-		"$todo": "To Do",
-		"$label1": "Important",
-		"$label2": "Work",
-		"$label3": "Personal",
-		"$label4": "To Do",
-		"$label5": "Later"
+		"$important": "Importante",
+		"$todo": "Da fare",
+		"$label1": "Importante",
+		"$label2": "Opera",
+		"$label3": "Personale",
+		"$label4": "Da fare",
+		"$label5": "Dopo"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Avviso di lettura - %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 16f3716b3..17bc832e6 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
@@ -155,12 +155,12 @@
 		"TAGS": "Tags"
 	},
 	"MESSAGE_TAGS": {
-		"$important": "Important",
-		"$todo": "To Do",
-		"$label1": "Important",
-		"$label2": "Work",
-		"$label3": "Personal",
-		"$label4": "To Do",
+		"$important": "Belangrijk",
+		"$todo": "Te doen",
+		"$label1": "Belangrijk",
+		"$label2": "Werk",
+		"$label3": "Persoonlijk",
+		"$label4": "Te doen",
 		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
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 a740da181..3d6298e5c 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,9 +195,9 @@
 					</table>
 				</div>
 				<div class="hasVirus" data-bind="visible: message().hasVirus()" data-i18n="MESSAGE/HAS_VIRUS_WARNING"></div>
-				<div class="informationShort">
+				<div class="messageTags">
 					<span data-i18n="MESSAGE/TAGS"></span>:
-					<span data-bind="html: message().tags()"></span>
+					<span data-bind="html: message().tagsToHTML()"></span>
 				</div>
 			</div>
 			<div id="messageItem" data-bind="css: message().lineAsCss()">