diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index a72d72dbe..7c36c0119 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -899,6 +899,6 @@ class ServiceActions
 				$this->oActions->ProcessTemplate($sName, \file_get_contents($sFile)).'</template>';
 		}
 
-		return $sHtml;
+		return \str_replace('&nbsp;', "\xC2\xA0", $sHtml);
 	}
 }