diff --git a/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php b/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php
index 39e5848..3d5cdca 100644
--- a/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php
+++ b/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php
@@ -43,13 +43,15 @@ class SwiftMailCollector extends DataCollector implements Renderable, AssetProvi
     {
         $mails = array();
         foreach ($this->messagesLogger->getMessages() as $msg) {
-            $html = $this->showBody ? $msg->getBody() : null;
+            $body = $this->showBody ? $msg->getBody() : null;
+            $isHtml = strpos((string) $msg->getHeaders()->get('Content-Type'), 'html') !== false;
+
             $mails[] = array(
                 'to' => $this->formatTo($msg->getTo()),
                 'subject' => $msg->getSubject(),
                 'headers' => $msg->getHeaders()->toString(),
-                'body' => $html,
-                'html' => null,
+                'body' => !$isHtml ? $body : null,
+                'html' => $isHtml ? $body : null,
             );
         }
         return array(
diff --git a/src/DebugBar/Resources/widgets/mails/widget.js b/src/DebugBar/Resources/widgets/mails/widget.js
index 16045f7..fa2a1bd 100644
--- a/src/DebugBar/Resources/widgets/mails/widget.js
+++ b/src/DebugBar/Resources/widgets/mails/widget.js
@@ -43,6 +43,9 @@
                         var headers = $('<pre />').addClass(csscls('headers')).appendTo(li);
                         $('<code />').text(mail.headers).appendTo(headers);
                         li.click(function() {
+                            if (window.getSelection().type == "Range") {
+                                return''
+                            }
                             if (headers.is(':visible')) {
                                 headers.hide();
                             } else {