From 6463b662cac9c4cc40c4eac47cc4564cb8725cf8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Dec 2015 10:11:46 +0100
Subject: [PATCH] Fix regression in displaying contents of message/rfc822 parts
 (#1490606)

---
 CHANGELOG                   | 2 ++
 program/steps/mail/func.inc | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 487ff8139..c014d94b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix regression in displaying contents of message/rfc822 parts (#1490606)
+
 RELEASE 1.2-beta
 ----------------
 - Update TinyMCE to version 4.2
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b6c3fffcc..988c61de6 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1240,6 +1240,8 @@ function rcmail_message_body($attrib)
                         $part = $msgpart;
                         $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
                     }
+
+                    $body = $part->body;
                 }
 
                 // message is cached but not exists (#1485443), or other error