diff --git a/felamimail/inc/class.bocompose.inc.php b/felamimail/inc/class.bocompose.inc.php
index 3de0837bb8..d243894a22 100644
--- a/felamimail/inc/class.bocompose.inc.php
+++ b/felamimail/inc/class.bocompose.inc.php
@@ -858,6 +858,7 @@
 			$bofelamimail->openConnection();
 			if (is_array($this->sessionData) && isset($this->sessionData['attachments']))
 			{
+				$tnfattachments = null;
 				foreach((array)$this->sessionData['attachments'] as $attachment) {
 					if(is_array($attachment))
 					{
@@ -874,7 +875,20 @@
 									break;
 								default:
 									$attachmentData	= $bofelamimail->getAttachment($attachment['uid'], $attachment['partID']);
-
+									if ($attachmentData['type'] == 'APPLICATION/MS-TNEF')
+									{
+										if (!is_array($tnfattachments)) $tnfattachments = $bofelamimail->decode_winmail($attachment['uid'], $attachment['partID']);
+										foreach ($tnfattachments as $k)
+										{
+											if ($k['name'] == $attachment['name'])
+											{
+												$tnfpart = $bofelamimail->decode_winmail($attachment['uid'], $attachment['partID'],$k['is_winmail']);
+												$attachmentData['attachment'] = $tnfpart['attachment'];
+												//error_log(__METHOD__.__LINE__.$k['name'].'<->'.$attachment['name'].':'.array2string($attachmentData['attachment']));
+												break;
+											}
+										}
+									}
 									$_mailObject->AddStringAttachment($attachmentData['attachment'], $_mailObject->EncodeHeader($attachment['name']), 'base64', $attachment['type']);
 									break;