From c695fde29fd59e684b62b0e2ed95e83dc40dbb79 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 7 Dec 2009 17:23:53 +0100
Subject: [PATCH] Make iTip invitations a multipart/alternative message again.

---
 kronolith/lib/Kronolith.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 3bc0f0085..c19d449df 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1779,14 +1779,20 @@ class Kronolith
             $ics->setContentTypeParameter('METHOD', $method);
             $ics->setCharset(Horde_Nls::getCharset());
 
+            $multipart = new Horde_Mime_Part('multipart/alternative');
+            $body = new Horde_Mime_Part();
+            $body->setType('text/plain');
+            $body->setCharset(Horde_Nls::getCharset());
+            $body->setContents($message);
+            $multipart->addPart($body);
+            $multipart->addPart($ics);
             $recipient = empty($status['name']) ? $email : Horde_Mime_Address::trimAddress($status['name'] . ' <' . $email . '>');
             $mail = new Horde_Mime_Mail(array('subject' => $subject,
-                                              'body' => $message,
                                               'to' => $recipient,
                                               'from' => $from,
                                               'charset' => Horde_Nls::getCharset()));
             $mail->addHeader('User-Agent', 'Kronolith ' . $GLOBALS['registry']->getVersion());
-            $mail->addMimePart($ics);
+            $mail->setBasePart($multipart);
 
             try {
                 $mail->send(Horde::getMailerConfig());
-- 
2.11.0