diff --git a/CHANGELOG b/CHANGELOG
index caa676012..8333d0903 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/06/12 (alec)
+----------
+- Fix corrupted MIME headers of messages in Sent folder (#1485111)
+- Fixed bug in MDB2 package: http://pear.php.net/bugs/bug.php?id=14124
+- Use keypress instead of keydown to select list's row (#1484816)
+
 2008/06/11 (alec)
 ----------
 - Don't call expunge and don't remove message row after message move 
diff --git a/program/include/rcube_mail_mime.php b/program/include/rcube_mail_mime.php
index 866786b93..79c80dd69 100644
--- a/program/include/rcube_mail_mime.php
+++ b/program/include/rcube_mail_mime.php
@@ -27,6 +27,9 @@
  */
 class rcube_mail_mime extends Mail_mime
 {
+
+  protected $mime_content;
+
   /**
    * Set build parameters
    */
@@ -201,6 +204,21 @@ class rcube_mail_mime extends Mail_mime
     $result[] = substr($string, $p);
     return $result;
   }
+  
+  /**
+   * Provides caching of body of constructed MIME Message to avoid 
+   * duplicate construction of message and damage of MIME headers
+   *
+   * @return string The mime content
+   * @access public
+   * @override
+   */
+  public function &get($build_params = null)
+  {
+    if(empty($this->mime_content))
+      $this->mime_content = parent::get($build_params);
+    return $this->mime_content;
+  }
 
 }