diff --git a/api/src/Mailer.php b/api/src/Mailer.php
index ad2e3493ed..bdab9e3469 100644
--- a/api/src/Mailer.php
+++ b/api/src/Mailer.php
@@ -816,7 +816,7 @@ class Mailer extends Horde_Mime_Mail
 			if (!($part_id = $base->findBody($subtype))) return null;
 			return $base->getPart($part_id);
 		}
-		catch (Exception $e) {
+		catch (Horde_Mail_Exception $e) {
 			unset($e);
 			return $subtype == 'html' ? $this->_htmlBody : $this->_body;
 		}
diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index cca13c53b4..7fa8351a90 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -704,8 +704,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				}
 				// get all the attachments and add them too.
 				// start handle Attachments
-				//												$_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folderName=''
-				$attachments = $this->mail->getMessageAttachments($uid, null,          null,								true,						false,				 true			, $folder);
+				$attachments = $this->mail->getMessageAttachments($uid,null,null,true,false,true,$folder);
 				$attachmentNames = false;
 				if (is_array($attachments) && count($attachments)>0)
 				{