diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
index cf2072d71ba..fef4683c68f 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
@@ -522,6 +522,13 @@ public function fetchBodypart($folder, $uid, $id)
                 $query,
                 array('ids' => new Horde_Imap_Client_Ids($uid))
             );
+
+            // Already decoded?
+            if ($ret[$uid]->getBodyPartDecode($id)) {
+                return $ret[$uid]->getBodyPart($id, true);
+            }
+
+            // Not already decoded, let Horde_Mime do it.
             $part = $ret[$uid]->getStructure()->getPart($id);
             $part->setContents(
                 $ret[$uid]->getBodyPart($id, true),