diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index 832f3b9d1..4fccf6fa9 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -356,6 +356,14 @@ class ActionEmail extends ActionNotification
 			$oEmail->SetMessageId($sMessageId);
 		}
 
+		if (isset($aContextArgs['attachments']))
+		{
+			foreach($aContextArgs['attachments'] as $oDocument)
+			{
+				$oEmail->AddAttachment($oDocument->GetData(), $oDocument->GetFileName(), $oDocument->GetMimeType());
+			}
+		}
+
 		if (empty($this->m_aMailErrors))
 		{
 			if ($this->m_iRecipients == 0)