diff --git a/include/class.ticket.php b/include/class.ticket.php
index 409804f865aa6009d67c42a864e748192ea1905e..95699e8f7949cc901bdb1fca6f7dcbaf8fd147dc 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -4134,10 +4134,14 @@ implements RestrictedAccess, Threadable, Searchable {
            $attachments = array();
            $message = $ticket->getLastMessage();
            if ($cfg->emailAttachments()) {
-               if ($message)
-                 $attachments = $message->getAttachments();
-               if ($response && $response->getNumAttachments())
-                 $attachments = $attachments->merge($response->getAttachments());
+               if ($message && $message->getNumAttachments()) {
+                 foreach ($message->getNumAttachments() as $attachment)
+                     $attachments[] = $attachment;
+               }
+               if ($response && $response->getNumAttachments()) {
+                 foreach ($response->getAttachments() as $attachment)
+                     $attachments[] = $attachment;
+               }
            }
 
             if ($vars['signature']=='mine')