diff --git a/src/backend/imap/imap.php b/src/backend/imap/imap.php
index 7eafd65b..f9349e44 100644
--- a/src/backend/imap/imap.php
+++ b/src/backend/imap/imap.php
@@ -1226,13 +1226,7 @@ public function GetMessage($folderid, $id, $contentparameters) {
                         break;
                     case SYNC_BODYPREFERENCE_MIME:
                         if ($is_smime) {
-                            if ($is_encrypted) {
-                                // #190, KD 2015-06-04 - If message body is encrypted only send the headers, as data should only be in the attachment
-                                $data = $mail_headers;
-                            }
-                            else {
-                                $data = $mail;
-                            }
+                            $data = $mail;
                         }
                         else {
                             $data = build_mime_message($message);