diff --git a/lib/Service/Html.php b/lib/Service/Html.php
index 0703c5de9355b13d503a33767a12cc0f59ac93dc..8e33cd6bad24d9aeb344ff9d80efc99404d10aef 100755
--- a/lib/Service/Html.php
+++ b/lib/Service/Html.php
@@ -96,7 +96,7 @@ class Html {
 	 */
 	public function parseMailBody(string $body): array {
 		$signature = null;
-		$parts = explode("-- \r\n", $body);
+		$parts = preg_split("/-- (\n|(\r\n))/", $body);
 		if (count($parts) > 1) {
 			$signature = array_pop($parts);
 			$body = implode("-- \r\n", $parts);
diff --git a/src/components/MessagePlainTextBody.vue b/src/components/MessagePlainTextBody.vue
index ea134dde39e40fdf81b0a2dd2ae5009375c369d9..2cac72ce8a30986e00e478ec60142847da972ec0 100644
--- a/src/components/MessagePlainTextBody.vue
+++ b/src/components/MessagePlainTextBody.vue
@@ -36,8 +36,6 @@ export default {
 
 <style scoped>
 .mail-signature {
-	font-family: monospace;
-	opacity: 0.5;
-	line-height: initial;
+	color: var(--color-text-maxcontrast)
 }
 </style>
diff --git a/src/components/Thread.vue b/src/components/Thread.vue
index 7d14f8d596e800cd0d74cd286435b86e7afc5d97..9045170aa463d13deed76e607132eee2e1adb658 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -205,7 +205,7 @@ export default {
 	text-align: left;
 }
 
-#mail-content {
+#mail-content, .mail-signature {
 	margin: 10px 38px 50px 38px;
 
 	.mail-message-body-html & {