diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php
index 96fd3d8c565..641e5065955 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php
@@ -913,13 +913,11 @@ protected function _buildMailMessage(
         Horde_Imap_Client_Data_Fetch $data,
         $options = array())
     {
-        $imap = $this->_getImapOb();
-
         $version = empty($options['protocolversion']) ?
             Horde_ActiveSync::VERSION_TWOFIVE :
             $options['protocolversion'];
 
-        $imap_message = new Horde_ActiveSync_Imap_Message($imap, $mbox, $data);
+        $imap_message = new Horde_ActiveSync_Imap_Message($this->_getImapOb(), $mbox, $data);
         $eas_message = Horde_ActiveSync::messageFactory('Mail');
 
         // Build To: data (POOMMAIL_TO has a max length of 32768).