diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index 015b9ece7..374ea795f 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -270,6 +270,13 @@ class SquireUI
 							btn.classList.toggle('active', 'source' == this.mode);
 						}
 					}
+				},
+
+				clear: {
+					removeStyle: {
+						html: '⎚',
+						cmd: () => squire.setStyle()
+					}
 				}
 			},
 
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 07fdccc26..bdd269023 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "العام",
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 5519db922..a08a14b14 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Общи",
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 27c7391a3..12c60e93e 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Všeobecné",
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 eec7023a5..e78790af0 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Generelt",
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 b21c93a85..55cb01fc2 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Bild URL",
 		"IMAGEUPLOAD": "Bilddatei auswählen",
 		"UNDO": "Rückgängig",
-		"REDO": "Wiederholen"
+		"REDO": "Wiederholen",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Allgemein",
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 16ccd7de4..ce6186b77 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Γενικό",
diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json
index e16c36d96..95ffaf244 100644
--- a/snappymail/v/0.0.0/app/localization/en-GB/user.json
+++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "General",
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 a595dd053..7b200e5b7 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "General",
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 ba548f71b..ab90873f6 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "General",
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 3a65d5f1e..a96c1ca29 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Üldine",
diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json
index d72d156b8..180723640 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Orokorra",
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 106663347..00729adc2 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "عمومی",
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 291b8cce0..b39218275 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Yleinen",
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 6be08d24b..58b534674 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "URL de l'image",
 		"IMAGEUPLOAD": "Sélection de l'image",
 		"UNDO": "Annuler",
-		"REDO": "Refaire"
+		"REDO": "Refaire",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Général",
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 1d660f5b6..313a1d93b 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Általános",
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 21ab6b2ee..849c7a8fc 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Umum",
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 16f4bdb21..73912ef91 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Almennt",
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 38511e26d..8935c185c 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Generali",
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 1894a5c23..6e6f75ee6 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "全般",
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 3e94c8fe4..563f1e04b 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "일반",
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 5388a8194..eba31d720 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Pagrindiniai",
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 7633b7f3e..f5be86fc4 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Vispārējie",
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 130ad1311..f2334dcd6 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Generelt",
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 8aeabbcb3..d8b8ce943 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Afbeelding URL",
 		"IMAGEUPLOAD": "Upload afbeelding",
 		"UNDO": "Ongedaan maken",
-		"REDO": "Opnieuw"
+		"REDO": "Opnieuw",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Algemeen",
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 fd7f84307..30530d091 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Odnośnik obrazu",
 		"IMAGEUPLOAD": "Wybierz obraz",
 		"UNDO": "Cofnij",
-		"REDO": "Ponów"
+		"REDO": "Ponów",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Ogólne",
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 4fa0e73a8..c7e93a0bb 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Geral",
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 c1867413e..d0d33478f 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Imagem por URL",
 		"IMAGEUPLOAD": "Escolher imagem",
 		"UNDO": "Desfazer",
-		"REDO": "Refazer"
+		"REDO": "Refazer",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Geral",
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
index c1867413e..d0d33478f 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Imagem por URL",
 		"IMAGEUPLOAD": "Escolher imagem",
 		"UNDO": "Desfazer",
-		"REDO": "Refazer"
+		"REDO": "Refazer",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Geral",
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 7900a5681..49db966cf 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "De bază",
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 0cd3f6343..0ff9882d8 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Основные",
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 b2a9cb907..ecd7f7856 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Všeobecné",
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 fd0c0869c..027f533dd 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Splošno",
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 94f375fae..e79851247 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Allmänt",
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 2e20996fe..f4ea8f0e5 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Genel",
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 f4bf51340..1c668bb47 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "Основні",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
index 2465510f4..660a78cbe 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@@ -386,7 +386,8 @@
 		"IMAGEURL": "Image URL",
 		"IMAGEUPLOAD": "Image select",
 		"UNDO": "Undo",
-		"REDO": "Redo"
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "General",
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 f742cd92a..c9f0452d0 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "图片 URL",
 		"IMAGEUPLOAD": "选择图片",
 		"UNDO": "撤销",
-		"REDO": "重做"
+		"REDO": "重做",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "常规",
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 f67a72e72..ec9e9df05 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
@@ -386,7 +386,8 @@
 		"IMAGEURL": "圖片 URL",
 		"IMAGEUPLOAD": "圖片選取",
 		"UNDO": "復原",
-		"REDO": "取消復原"
+		"REDO": "取消復原",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
 		"GENERAL": "一般設定",
diff --git a/vendors/squire/build/squire-raw.js b/vendors/squire/build/squire-raw.js
index 77864359c..4a44cd92c 100644
--- a/vendors/squire/build/squire-raw.js
+++ b/vendors/squire/build/squire-raw.js
@@ -1808,12 +1808,12 @@ const
 
 	setAttributes = (node, props) => {
 		props && Object.entries(props).forEach(([k,v]) => {
-			if ("style" === k && typeof v === "object") {
-				Object.entries(v).forEach(([k,v]) => node.style[k] = v);
-			} else if (v != null) {
-				node.setAttribute(k, v);
-			} else {
+			if (null == v) {
 				node.removeAttribute(k);
+			} else if ("style" === k && typeof v === "object") {
+				Object.entries(v).forEach(([k,v]) => node.style[k] = v);
+			} else {
+				node.setAttribute(k, v);
 			}
 		});
 	},
@@ -2262,7 +2262,7 @@ class Squire
 			},
 			formatRemove: event => {
 				event.preventDefault();
-				this.setStyle(null);
+				this.setStyle();
 			},
 			formatSetBlockTextDirection: event => {
 				event.preventDefault();
@@ -3665,9 +3665,20 @@ class Squire
 		let end = range ? range.endContainer : 0;
 		// When the selection is all the text inside an element, set style on the element itself
 		if ("dir" == name || (isTextNode(start) && 0 === range.startOffset && start === end && end.length === range.endOffset)) {
-			this.saveUndoState(range);
+			this._recordUndoState(range);
 			setAttributes(start.parentNode, {[name]: value});
-			this.setRange(range);
+//			this.setRange(range);
+			this._docWasChanged();
+		}
+		// Else when it should remove the attribute
+		else if (null == value) {
+			this._recordUndoState(range);
+			let node = getClosest(range.commonAncestorContainer, this._root, '*');
+			range.collapsed
+				? setAttributes(node, {[name]: value})
+				: node.querySelectorAll('*').forEach(el => setAttributes(el, {[name]: value}));
+//			this.setRange(range);
+			this._docWasChanged();
 		}
 		// Else create a span element
 		else {