From 9796cd2063770a8562d58d6492fd6904cdeb4627 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 02 May 2016 12:01:18 -0400
Subject: [PATCH] Merge branch 'dev-rfc822-preview'

---
 program/steps/mail/headers.inc |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 7fb8d58..17a471e 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/headers.inc                                        |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2007, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2016, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -20,7 +20,14 @@
 */
 
 if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST)) {
-    $source = $RCMAIL->storage->get_raw_headers($uid);
+    if ($pos = strpos($uid, '.')) {
+        $message = new rcube_message($uid);
+        $source  = $message->get_part_body(substr($uid, $pos + 1));
+        $source  = substr($source, 0, strpos($source, "\r\n\r\n"));
+    }
+    else {
+        $source = $RCMAIL->storage->get_raw_headers($uid);
+    }
 
     if ($source !== false) {
         $source = trim(rcube_charset::clean($source));

--
Gitblit v1.9.1