diff --git a/resources/scss/_custom-styles.scss b/resources/scss/_custom-styles.scss
index 8507892..7a61a3b 100644
--- a/resources/scss/_custom-styles.scss
+++ b/resources/scss/_custom-styles.scss
@@ -320,4 +320,13 @@ p {
 
 .nav-link.disabled {
     color: #6c757d !important;
+}
+
+.maileclipse-key::before {
+    content: '\f13d';
+    position: relative;
+    margin: -21px 1px;
+    font-family: FontAwesome;
+    font-size: 10px;
+    color: #087fff;
 }
\ No newline at end of file
diff --git a/src/mailEclipse.php b/src/mailEclipse.php
index 226acb6..a598b8a 100644
--- a/src/mailEclipse.php
+++ b/src/mailEclipse.php
@@ -813,7 +813,7 @@ static public function renderPreview($simpleview = false, $view, $template = fal
 
             foreach ($_data as $key => $value) {
                 if (!is_object($value)) {
-                    $_data[$key] = "{{ $key }}";
+                    $_data[$key] = '<span class="maileclipse-key" title="Variable">'.$key.'</span>';
                 }
             }
 
@@ -827,16 +827,12 @@ static public function renderPreview($simpleview = false, $view, $template = fal
         try {
 
             if ($simpleview) {
-
-                $renderer_html = view($_view, $_data)->render();
-                return $renderer_html;
-
+                return htmlspecialchars_decode(view($_view, $_data)->render());
             }
 
             $_md = self::buildMailable(Markdown::class, 'make');
-            $renderer_html = $_md->render($_view, $_data);
 
-            return $renderer_html;
+            return htmlspecialchars_decode($_md->render($_view, $_data));
 
         } catch (ErrorException $e) {