From 729b4930bdc5c43fb886df817a7267a466d726a4 Mon Sep 17 00:00:00 2001
From: bison-paolo <bison.paolo@gmail.com>
Date: Thu, 15 Dec 2016 15:59:11 +0100
Subject: [PATCH] Message system bugfixes

---
 application/controllers/api/v1/system/Message.php | 3 ++-
 application/libraries/MessageLib.php              | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/v1/system/Message.php b/application/controllers/api/v1/system/Message.php
index 21c1c24d4..bf5deca9f 100644
--- a/application/controllers/api/v1/system/Message.php
+++ b/application/controllers/api/v1/system/Message.php
@@ -121,7 +121,8 @@ class Message extends APIv1_Controller
 				$this->post()['body'],
 				PRIORITY_NORMAL,
 				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,
-				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null
+				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null,
+				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true
 			);
 			
 			$this->response($result, REST_Controller::HTTP_OK);
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index 0d80b3495..375e4b85c 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -205,7 +205,7 @@ class MessageLib
      * sendMessage() - sends new internal message. This function will create a new thread
      *
      */
-    public function sendMessage($sender_id, $receiver_id, $subject, $body, $priority = PRIORITY_NORMAL, $relationmessage_id = null, $oe_kurzbz = null)
+    public function sendMessage($sender_id, $receiver_id, $subject, $body, $priority = PRIORITY_NORMAL, $relationmessage_id = null, $oe_kurzbz = null, $multiPartMime = true)
     {
         if (!is_numeric($sender_id))
         {
@@ -243,7 +243,7 @@ class MessageLib
 							if ($this->ci->config->item('send_immediately') === true)
 							{
 								// Send message by email!
-								$resultSendEmail = $this->sendOne($result->retval, $subject, $body);
+								$resultSendEmail = $this->sendOne($result->retval, $subject, $body, $multiPartMime);
 							}
 						}
 					}
@@ -287,7 +287,7 @@ class MessageLib
      * @param   integer  $priority
      * @return  array
      */
-    public function sendMessageVorlage($sender_id, $receiver_id, $vorlage_kurzbz, $oe_kurzbz, $data, $relationmessage_id = null, $orgform_kurzbz = null)
+    public function sendMessageVorlage($sender_id, $receiver_id, $vorlage_kurzbz, $oe_kurzbz, $data, $relationmessage_id = null, $orgform_kurzbz = null, $multiPartMime = true)
     {
         if (!is_numeric($sender_id))
         {