diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index a4a0097c13..8c25ba8825 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1693,7 +1693,8 @@ class mail_compose
 						$_folder,
 						$attachment['name'],
 						$attachment['mimeType'],
-						$attachment['size']);
+						$attachment['size'],
+						$attachment['is_winmail']);
 				}
 			}
 		}
@@ -1831,7 +1832,7 @@ class mail_compose
 		}
 	}
 
-	function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size)
+	function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size, $_is_winmail= null)
 	{
 		$this->sessionData['attachments'][]=array (
 			'uid'		=> $_uid,
@@ -1840,6 +1841,7 @@ class mail_compose
 			'type'		=> $_type,
 			'size'		=> $_size,
 			'folder'	=> $_folder,
+			'winmailFlag' => $_is_winmail,
 			'tmp_name'	=> mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID)?$_partID:count($this->sessionData['attachments'])+1),
 		);
 	}