diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index e584ec6e64..1ffa933e4e 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -2404,7 +2404,7 @@ class infolog_ui
 		{
 			$GLOBALS['egw_info']['flags']['currentapp'] = 'infolog';
 
-			if (is_array($_attachments))
+			if (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')&&is_array($_attachments))
 			{
 				//echo __METHOD__.'<br>';
 				//_debug_array($_attachments);
@@ -2501,7 +2501,7 @@ class infolog_ui
 			$mailobject->openConnection();
 			$mailobject->reopen($mailbox);
 
-			$mailcontent = $mailClass::get_mailcontent($mailobject,$uid,$partid,$mailbox);
+			$mailcontent = $mailClass::get_mailcontent($mailobject,$uid,$partid,$mailbox,false,true,(!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')));
 
 			// this one adds the mail itself (as message/rfc822 (.eml) file) to the infolog as additional attachment
 			// this is done to have a simple archive functionality (ToDo: opening .eml in email module)