diff --git a/application/controllers/api/v1/system/Message.php b/application/controllers/api/v1/system/Message.php
index be87526ed..5c663e832 100644
--- a/application/controllers/api/v1/system/Message.php
+++ b/application/controllers/api/v1/system/Message.php
@@ -144,26 +144,26 @@ class Message extends APIv1_Controller
 	 */
 	public function postMessage()
 	{
-		$validation = $this->_validatePostMessage($this->post());
+		$postMessage = $this->_validatePostMessage($this->post());
 
-		if (isSuccess($validation))
+		if (isSuccess($postMessage))
 		{
-			$result = $this->messagelib->sendMessage(
-				isset($this->post()['person_id']) ? $this->post()['person_id'] : null,
-				isset($this->post()['receiver_id']) ? $this->post()['receiver_id'] : null,
-				$this->post()['subject'],
-				$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, // Sender organisation unit
-				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true
+			$result = $this->messagelib->sendMessageUser(
+				$this->post()['receiver_id']),																// receiverPersonId
+				$this->post()['subject'],																	// subject
+				$this->post()['body'],																		// body
+				$this->post()['person_id']) ? $this->post()['person_id'] : null,							// sender_id
+				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null, 						// senderOU
+				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,	// relationmessage_id
+				MSG_PRIORITY_NORMAL,																		// priority
+				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true				// multiPartMime
 			);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
 		else
 		{
-			$this->response($validation, REST_Controller::HTTP_OK);
+			$this->response($postMessage, REST_Controller::HTTP_OK);
 		}
 	}
 
@@ -172,26 +172,27 @@ class Message extends APIv1_Controller
 	 */
 	public function postMessageVorlage()
 	{
-		$validation = $this->_validatePostMessageVorlage($this->post());
+		$postMessage = $this->_validatePostMessageVorlage($this->post());
 
-		if (isSuccess($validation))
+		if (isSuccess($postMessage))
 		{
-			$result = $this->messagelib->sendMessageVorlage(
-				isset($this->post()['sender_id']) ? $this->post()['sender_id'] : null,
-				isset($this->post()['receiver_id']) ? $this->post()['receiver_id'] : null,
-				$this->post()['vorlage_kurzbz'],
-				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null, // Sender organisation unit
-				$this->post()['data'],
-				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,
-				isset($this->post()['orgform_kurzbz']) ? $this->post()['orgform_kurzbz'] : null,
-				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true
+			$result = $this->messagelib->sendMessageUserTemplate(
+				isset($this->post()['receiver_id']) ? $this->post()['receiver_id'] : null,					// receiversPersonId
+				$this->post()['vorlage_kurzbz'],															// vorlage
+				$this->post()['data'],																		// parseData
+				isset($this->post()['orgform_kurzbz']) ? $this->post()['orgform_kurzbz'] : null,			// orgform
+				isset($this->post()['sender_id']) ? $this->post()['sender_id'] : null,						// sender_id
+				isset($this->post()['oe_kurzbz']) ? $this->post()['oe_kurzbz'] : null,						// senderOU
+				isset($this->post()['relationmessage_id']) ? $this->post()['relationmessage_id'] : null,	// relationmessage_id
+				MSG_PRIORITY_NORMAL,																		// priority
+				isset($this->post()['multiPartMime']) ? $this->post()['multiPartMime'] : true				// multiPartMime
 			);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
 		else
 		{
-			$this->response($validation, REST_Controller::HTTP_OK);
+			$this->response($postMessage, REST_Controller::HTTP_OK);
 		}
 	}
 
@@ -220,26 +221,26 @@ class Message extends APIv1_Controller
 	/**
 	 * _validatePostMessage
 	 */
-	private function _validatePostMessage($message = null)
+	private function _validatePostMessage($post = null)
 	{
-		if (!isset($message))
+		if (!isset($post))
 		{
 			return error('Parameter is null');
 		}
-		if (!isset($message['subject']))
+		if (!isset($post['subject']))
 		{
 			return error('subject is not set');
 		}
-		if( !isset($message['body']))
+		if (!isset($post['body']))
 		{
 			return error('body is not set');
 		}
-		if (!isset($message['receiver_id']) && !isset($message['oe_kurzbz']))
+		if (!isset($post['receiver_id']))
 		{
-			return error('If a receiver_id is not given a oe_kurzbz must be specified');
+			return error('receiver_id is not set');
 		}
 
-		return success('Input data are valid');
+		return success();
 	}
 
 	/**
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index feba96473..7911d4b2d 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -7,7 +7,21 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class MessageLib
 {
-	const MSG_INDX_PREFIX = 'message_';
+	// Config entries
+	const CFG_SYSTEM_PERSON_ID = 'system_person_id';
+	const CFG_SEND_IMMEDIATELY = 'send_immediately';
+	const CFG_MESSAGE_SERVER = 'message_server';
+	const CFG_MESSAGE_HTML_VIEW_URL = 'message_html_view_url';
+	const CFG_OU_RECEIVERS = 'ou_receivers';
+
+	// Templates names
+	const NOTICE_TEMPLATE_HTML = 'MessageMailHTML';
+	const NOTICE_TEMPLATE_TXT = 'MessageMailTXT';
+	const NOTICE_TEMPLATE_FALLBACK_HTML = 'templates/mailHTML';
+	const NOTICE_TEMPLATE_FALLBACK_TXT = 'templates/mailTXT';
+
+	const EMAIL_KONTAKT_TYPE = 'email'; // Email kontakt type
+	const SENT_INFO_NEWLINE = '\n'; // tbl_msg_recipient->sentInfo separator
 
 	private $_ci;
 
@@ -22,8 +36,6 @@ class MessageLib
 		// Loads message configuration
 		$this->_ci->config->load('message');
 
-		// CI Parser library
-		$this->_ci->load->library('parser');
 		// Loads LogLib
 		$this->_ci->load->library('LogLib');
 		// Loads VorlageLib
@@ -31,352 +43,106 @@ class MessageLib
 		// Loads Mail library
 		$this->_ci->load->library('MailLib');
 
-		// Loading models
+		// Loads message models
 		$this->_ci->load->model('system/Message_model', 'MessageModel');
 		$this->_ci->load->model('system/MsgStatus_model', 'MsgStatusModel');
 		$this->_ci->load->model('system/Recipient_model', 'RecipientModel');
 		$this->_ci->load->model('system/Attachment_model', 'AttachmentModel');
+
+		// Loads extra models
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+		$this->_ci->load->model('system/Benutzerrolle_model', 'BenutzerrolleModel');
+		$this->_ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	/**
-	 * getMessage() - returns the specified received message for a specified person
+	 * Returns the specified message for a specified person
 	 */
 	public function getMessage($msg_id, $person_id)
 	{
-		if (!is_numeric($msg_id))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_RECIPIENTS);
+		if (!is_numeric($msg_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+		if (!is_numeric($person_id)) return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
 
 		return $this->_ci->RecipientModel->getMessage($msg_id, $person_id);
 	}
 
 	/**
-	 * getMessagesByUID() - will return all messages, including the latest status for specified user. It don´t returns Attachments.
+	 * Sends a message to persons ($receiversPersonId)
 	 */
-	public function getMessagesByUID($uid, $oe_kurzbz = null, $all = false)
+	public function sendMessageUser(
+		$receiversPersonId, $subject, $body, // Required parameters
+		$sender_id = null, $senderOU = null, $relationmessage_id = null, $priority = MSG_PRIORITY_NORMAL, $multiPartMime = true
+	)
 	{
-		if (isEmptyString($uid))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
+		// Retrieves receiver id and checks that is valid
+		$receivers = $this->_getReceiversByPersonId($receiversPersonId);
+		if (isError($receivers)) return $receivers;
 
-		return $this->_ci->RecipientModel->getMessagesByUID($uid, $oe_kurzbz, $all);
+		// Send the message and return the result
+		return $this->_sendMessage($receivers, null, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime);
 	}
 
 	/**
-	 * getMessagesByPerson() - will return all messages, including the latest status for specified user. It don´t returns Attachments.
+	 * Sends a message to persons ($receiversPersonId)
 	 */
-	public function getMessagesByPerson($person_id, $oe_kurzbz = null, $all = false)
+	public function sendMessageUserTemplate(
+		$receiversPersonId, $vorlage, $parseData, // Required parameters
+		$orgform = null, $sender_id = null, $senderOU = null, $relationmessage_id = null, $priority = MSG_PRIORITY_NORMAL, $multiPartMime = true
+	)
 	{
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
-
-		return $this->_ci->RecipientModel->getMessagesByPerson($person_id, $oe_kurzbz, $all);
-	}
-
-	/**
-	 * getSentMessagesByPerson() - Get all sent messages from a person identified by person_id
-	 */
-	public function getSentMessagesByPerson($person_id, $oe_kurzbz = null, $all = false)
-	{
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
-
-		return $this->_ci->MessageModel->getMessagesByPerson($person_id, $oe_kurzbz, $all);
-	}
-
-	/**
-	 * getMessageByToken
-	 */
-	public function getMessageByToken($token)
-	{
-		if (isEmptyString($token))
-			return $this->_error('', MSG_ERR_INVALID_TOKEN);
-
-		$result = $this->_ci->RecipientModel->getMessageByToken($token);
-		if (hasData($result))
+		// Loads template data
+		$templateResult = $this->_ci->vorlagelib->loadVorlagetext($vorlage, $senderOU, $orgform, getUserLanguage());
+		if (hasData($templateResult)) // if a template is found
 		{
-			// Searches for a status that is different from unread
-			$found = -1;
-			for ($i = 0; $i < count($result->retval); $i++)
-			{
-				if ($result->retval[$i]->status > MSG_STATUS_UNREAD)
-				{
-					$found = $i;
-					break;
-				}
-			}
+			$template = getData($templateResult)[0]; // template object
 
-			// If not found then insert the read status
-			if ($found == -1)
-			{
-				$statusKey = array(
-					'message_id' => $result->retval[0]->message_id,
-					'person_id' => $result->retval[0]->receiver_id,
-					'status' => MSG_STATUS_READ
-				);
+			// Parses template subject
+			$subject = parseText($template->subject, $parseData);
+			// Parses template text
+			$body = parseText($template->text, $parseData);
 
-				$resultIns = $this->_ci->MsgStatusModel->insert($statusKey);
-				// If an error occured while writing on data base, then return it
-				if (isError($resultIns))
-				{
-					$result = $resultIns;
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * getCountUnreadMessages
-	 */
-	public function getCountUnreadMessages($person_id, $oe_kurzbz = null)
-	{
-		if (!is_numeric($person_id))
-			return $this->_error('', MSG_ERR_INVALID_RECIPIENTS);
-
-		return $this->_ci->RecipientModel->getCountUnreadMessages($person_id, $oe_kurzbz);
-	}
-
-	/**
-	 * updateMessageStatus() - will change status on message for particular user
-	 * NOTE: it performs an insert, NOT an update
-	 */
-	public function updateMessageStatus($message_id, $person_id, $status)
-	{
-		if (!is_numeric($message_id))
-		{
-			return $this->_error('', MSG_ERR_INVALID_MSG_ID);
-		}
-
-		if (!is_numeric($person_id))
-		{
-			return $this->_error('', MSG_ERR_INVALID_USER_ID);
-		}
-
-		// NOTE: Not use empty otherwise if status is 0 it returns an error
-		if (!isset($status))
-		{
-			return $this->_error('', MSG_ERR_INVALID_STATUS_ID);
-		}
-
-		// Searches if the status is already present
-		$result = $this->_ci->MsgStatusModel->load(array($message_id, $person_id, $status));
-		if (hasData($result))
-		{
-			// status already present
-		}
-		else
-		{
-			// Insert the new status
-			$statusKey = array(
-				'message_id' => $message_id,
-				'person_id' => $person_id,
-				'status' => $status
+			return $this->sendMessageUser(
+				$receiversPersonId, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime
 			);
-
-			$result = $this->_ci->MsgStatusModel->insert($statusKey);
 		}
-
-		return $result;
+		elseif (isError($templateResult)) // if an error occured
+		{
+			return $templateResult; // return it
+		}
+		else // if a template was not found
+		{
+			return error('Template was not found', MSG_ERR_INVALID_TEMPLATE);
+		}
 	}
 
 	/**
-	 * sendMessage() - sends new internal message. This function will create a new thread
+	 * Sends a message to all the persons that are enabled to read messages for the given organisation unit ($receiversOU)
 	 */
-	public function sendMessage($sender_id, $receiver_id, $subject, $body, $priority = PRIORITY_NORMAL, $relationmessage_id = null, $oe_kurzbz = null, $multiPartMime = true)
+	public function sendMessageOU(
+		$receiversOU, $subject, $body, // Required parameters
+		$sender_id = null, $senderOU = null, $relationmessage_id = null, $priority = MSG_PRIORITY_NORMAL, $multiPartMime = true
+	)
 	{
-		if (!is_numeric($sender_id))
-		{
-			$sender_id = $this->_ci->config->item('system_person_id');
-		}
+		// If the recipient is an organisation unit that would be possible to send the same message (same message id)
+		// to the entire organisation unit (one to many functionality)
+		// In this case the receiver id is a the one present in message configuration
+		$receivers = success(array($this->_ci->config->item(self::CFG_SYSTEM_PERSON_ID)));
 
-		$receivers = $this->_getReceivers($receiver_id, $oe_kurzbz);
-
-		// If everything went ok
-		if (isSuccess($receivers) && is_array($receivers->retval))
-		{
-			// If no receivers were found for this organization unit
-			if (count($receivers->retval) == 0)
-			{
-				$result = $this->_error($receivers->retval, MSG_ERR_OU_CONTACTS_NOT_FOUND);
-			}
-
-			// Looping on receivers
-			for ($i = 0; $i < count($receivers->retval); $i++)
-			{
-				$receiver_id = $receivers->retval[$i]->person_id;
-
-				// Checks if the receiver exists
-				if ($this->_checkReceiverId($receiver_id))
-				{
-					// If the text and the subject of the template are not empty
-					if (!isEmptyString($subject) && !isEmptyString($body))
-					{
-						$result = $this->_saveMessage($sender_id, $receiver_id, $subject, $body, $relationmessage_id, $oe_kurzbz);
-						// If no errors were occurred
-						// Leave the code commented
-						if (isSuccess($result))
-						{
-							// If the system is configured to send messages immediately
-							if ($this->_ci->config->item('send_immediately') === true)
-							{
-								// Send message by email!
-								$resultSendEmail = $this->sendOne($result->retval, $subject, $body, $multiPartMime);
-							}
-						}
-					}
-					else
-					{
-						if (isEmptyString($subject))
-						{
-							$result = $this->_error('', MSG_ERR_SUBJECT_EMPTY);
-							break;
-						}
-						elseif (isEmptyString($body))
-						{
-							$result = $this->_error('', MSG_ERR_BODY_EMPTY);
-							break;
-						}
-					}
-				}
-				else
-				{
-					$result = $this->_error('', MSG_ERR_INVALID_RECEIVER_ID);
-					break;
-				}
-			}
-		}
-		// If there was some errors then copy them into the returning variable
-		else
-		{
-			$result = $receivers;
-		}
-
-		return $result;
+		// Send the message and return the result
+		return $this->_sendMessage($receivers, $receiversOU, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime);
 	}
 
-	/**
-	 * Sends new internal message using a template
-	 */
-	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))
-		{
-			$sender_id = $this->_ci->config->item('system_person_id');
-		}
-
-		$receivers = $this->_getReceivers($receiver_id, $oe_kurzbz);
-
-		// If everything went ok
-		if (isSuccess($receivers) && is_array($receivers->retval))
-		{
-			// If no receivers were found for this organization unit
-			if (count($receivers->retval) == 0)
-			{
-				$result = $this->_error($receivers->retval, MSG_ERR_OU_CONTACTS_NOT_FOUND);
-			}
-			else
-			{
-				// Load reveiver data to get its relative language
-				$this->_ci->load->model('person/Person_model', 'PersonModel');
-			}
-
-			// Looping on receivers
-			for ($i = 0; $i < count($receivers->retval); $i++)
-			{
-				$receiver_id = $receivers->retval[$i]->person_id;
-
-				// Checks if the receiver exists
-				$result = $this->_ci->PersonModel->load($receiver_id);
-				if (hasData($result))
-				{
-					// Retrieves the language of the logged user
-					$sprache = getUserLanguage();
-
-					// Loads template data
-					$result = $this->_ci->vorlagelib->loadVorlagetext($vorlage_kurzbz, $oe_kurzbz, $orgform_kurzbz, $sprache);
-					if (isSuccess($result))
-					{
-						// If the text and the subject of the template are not empty
-						if (is_array($result->retval) && count($result->retval) > 0 &&
-							!isEmptyString($result->retval[0]->text) && !isEmptyString($result->retval[0]->subject))
-						{
-							// Parses template text
-							$parsedText = $this->_ci->vorlagelib->parseVorlagetext($result->retval[0]->text, $data);
-							// Parses subject
-							$subject = $this->_ci->vorlagelib->parseVorlagetext($result->retval[0]->subject, $data);
-
-							// Save message
-							$result = $this->_saveMessage($sender_id, $receiver_id, $subject, $parsedText, $relationmessage_id, $oe_kurzbz);
-							// If no errors were occurred
-							if (isSuccess($result))
-							{
-								// If the system is configured to send messages immediately
-								if ($this->_ci->config->item('send_immediately') === true)
-								{
-									// Send message by email!
-									$resultSendEmail = $this->sendOne($result->retval, $subject, $parsedText, $multiPartMime);
-								}
-							}
-						}
-						else
-						{
-							// Better message error
-							if (!is_array($result->retval) || (is_array($result->retval) && count($result->retval) == 0))
-							{
-								$result = $this->_error('', MSG_ERR_TEMPLATE_NOT_FOUND);
-								break;
-							}
-							elseif (is_array($result->retval) && count($result->retval) > 0)
-							{
-								if (is_null($result->retval[0]->oe_kurzbz))
-								{
-									$result = $this->_error('', MSG_ERR_TEMPLATE_NOT_FOUND);
-									break;
-								}
-								elseif (isEmptyString($result->retval[0]->text))
-								{
-									$result = $this->_error('', MSG_ERR_INVALID_TEMPLATE);
-									break;
-								}
-								elseif (isEmptyString($result->retval[0]->subject))
-								{
-									$result = $this->_error('', MSG_ERR_INVALID_TEMPLATE);
-									break;
-								}
-							}
-						}
-					}
-					else
-					{
-						$result = $this->_error($result->retval, EXIT_ERROR);
-						break;
-					}
-				}
-				else
-				{
-					$result = $this->_error('', MSG_ERR_INVALID_RECEIVER_ID);
-					break;
-				}
-			}
-		}
-		// If there was some errors then copy them into the returning variable
-		else
-		{
-			$result = $receivers;
-		}
-
-		return $result;
-	}
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods called by a job
 
 	/**
 	 * Gets all the messages from DB and sends them via email
 	 */
-	public function sendAll($numberToSent = null, $numberPerTimeRange = null, $email_time_range = null, $email_from_system = null)
+	public function sendAllNotices($numberToSent = null, $numberPerTimeRange = null, $email_time_range = null, $email_from_system = null)
 	{
 		$sent = true; // optimistic expectation
 
@@ -393,8 +159,7 @@ class MessageLib
 		// Gets a number ($this->_ci->maillib->getMaxEmailToSent()) of unsent messages from DB
 		// having EMAIL_KONTAKT_TYPE as relative contact type
 		$result = $this->_ci->RecipientModel->getMessages(
-			EMAIL_KONTAKT_TYPE,
-			null,
+			self::EMAIL_KONTAKT_TYPE,
 			$this->_ci->maillib->getConfigs()->email_number_to_sent
 		);
 		// Checks if errors were occurred
@@ -410,21 +175,20 @@ class MessageLib
 					if ((!is_null($result->retval[$i]->receiver) && $result->retval[$i]->receiver != '')
 						|| (!is_null($result->retval[$i]->employeecontact) && $result->retval[$i]->employeecontact != ''))
 					{
-						$href = $this->_ci->config->item('message_server').$this->_ci->config->item('message_html_view_url').$result->retval[$i]->token;
+						$href = $this->_ci->config->item(self::CFG_MESSAGE_SERVER).$this->_ci->config->item(self::CFG_MESSAGE_HTML_VIEW_URL).$result->retval[$i]->token;
 
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailHTML');
+						$vorlage = $this->_ci->vorlagelib->loadVorlagetext(self::NOTICE_TEMPLATE_HTML);
 
 						if(hasData($vorlage))
 						{
 							// Using a template for the html email body
-							$body = $this->_ci->parser->parse_string(
+							$body = parseText(
 								$vorlage->retval[0]->text,
 								array(
 									'href' => $href,
 									'subject' => $result->retval[$i]->subject,
 									'body' => $result->retval[$i]->body
-								),
-								true
+								)
 							);
 						}
 						else
@@ -445,18 +209,17 @@ class MessageLib
 							$this->_ci->loglib->logError('Error while parsing the mail template');
 						}
 
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailTXT');
+						$vorlage = $this->_ci->vorlagelib->loadVorlagetext(self::NOTICE_TEMPLATE_TXT);
 						if(hasData($vorlage))
 						{
 							// Using a template for the plain text email body
-							$altBody = $this->_ci->parser->parse_string(
+							$altBody = parseText(
 								$vorlage->retval[0]->text,
 								array(
 									'href' => $href,
 									'subject' => $result->retval[$i]->subject,
 									'body' => $result->retval[$i]->body
-								),
-								true
+								)
 							);
 						}
 						else
@@ -506,7 +269,7 @@ class MessageLib
 						{
 							$this->_ci->loglib->logError('Error while sending an email');
 							// Writing errors in tbl_msg_recipient
-							$sme = $this->setMessageError(
+							$sme = $this->_setSentError(
 								$result->retval[$i]->message_id,
 								$result->retval[$i]->receiver_id,
 								'Error while sending an email',
@@ -520,7 +283,7 @@ class MessageLib
 						else
 						{
 							// Setting the message as sent in DB
-							$sent = $this->setMessageSent($result->retval[$i]->message_id, $result->retval[$i]->receiver_id);
+							$sent = $this->_setSentSuccess($result->retval[$i]->message_id, $result->retval[$i]->receiver_id);
 							// If some errors occurred
 							if (!$sent)
 							{
@@ -532,7 +295,7 @@ class MessageLib
 					{
 						$this->_ci->loglib->logError('This person does not have an email account');
 						// Writing errors in tbl_msg_recipient
-						$sme = $this->setMessageError(
+						$sme = $this->_setSentError(
 							$result->retval[$i]->message_id,
 							$result->retval[$i]->receiver_id,
 							'This person does not have an email account',
@@ -561,244 +324,51 @@ class MessageLib
 		return $sent;
 	}
 
-	/**
-	 * Gets one message from DB and sends it via email
-	 */
-	public function sendOne($message_id, $subject = null, $body = null, $multiPartMime = true)
-	{
-		$sent = true; // optimistic expectation
-
-		// Get a specific message from DB having EMAIL_KONTAKT_TYPE as relative contact type
-		$result = $this->_ci->RecipientModel->getMessages(
-			EMAIL_KONTAKT_TYPE,
-			null,
-			null,
-			$message_id
-		);
-
-		// Checks if errors were occurred
-		if (isSuccess($result))
-		{
-			// If data are present
-			if (is_array($result->retval) && count($result->retval) > 0)
-			{
-				// If the person has an email account
-				if ((!is_null($result->retval[0]->receiver) && $result->retval[0]->receiver != '')
-					|| (!is_null($result->retval[0]->employeecontact) && $result->retval[0]->employeecontact != ''))
-				{
-					// If it is required use a multi-part message in MIME format
-					if ($multiPartMime === true)
-					{
-						// Using a template for the html email body
-						$href = $this->_ci->config->item('message_server').$this->_ci->config->item('message_html_view_url').$result->retval[0]->token;
-
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailHTML');
-						if(hasData($vorlage))
-						{
-							$bodyMsg = $this->_ci->parser->parse_string(
-								$vorlage->retval[0]->text,
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						else
-						{
-							$bodyMsg = $this->_ci->parser->parse(
-								'templates/mailHTML',
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						if (is_null($bodyMsg) || $bodyMsg == '')
-						{
-							// $body = $result->retval[0]->body;
-							$this->_ci->loglib->logError('Error while parsing the html mail template');
-						}
-
-						// Using a template for the plain text email body
-						$vorlage = $this->_ci->vorlagelib->loadVorlagetext('MessageMailTXT');
-						if(hasData($vorlage))
-						{
-							$altBody = $this->_ci->parser->parse_string(
-								$vorlage->retval[0]->text,
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						else
-						{
-							$altBody = $this->_ci->parser->parse(
-								'templates/mailTXT',
-								array(
-									'href' => $href,
-									'subject' => $result->retval[0]->subject,
-									'body' => $result->retval[0]->body
-								),
-								true
-							);
-						}
-						if (is_null($altBody) || $altBody == '')
-						{
-							$this->_ci->loglib->logError('Error while parsing the plain text mail template');
-						}
-					}
-					else
-					{
-						$bodyMsg = $altBody = $body;
-					}
-
-					// If the sender is not an employee, then system-sender is used if empty
-					$sender = '';
-					if (!is_null($result->retval[0]->senderemployeecontact) && $result->retval[0]->senderemployeecontact != '')
-					{
-						$sender = $result->retval[0]->senderemployeecontact.'@'.DOMAIN;
-					}
-
-					$receiverContact = $result->retval[0]->receiver;
-					if (!is_null($result->retval[0]->employeecontact) && $result->retval[0]->employeecontact != '')
-					{
-						$receiverContact = $result->retval[0]->employeecontact.'@'.DOMAIN;
-					}
-
-					// Sending email
-					$sent = $this->_ci->maillib->send(
-						null,
-						$receiverContact,
-						is_null($subject) ? $result->retval[0]->subject : $subject, // if parameter subject is not null, use it!
-						$bodyMsg,
-						null,
-						null,
-						null,
-						$altBody
-					);
-					// If errors were occurred while sending the email
-					if (!$sent)
-					{
-						$this->_ci->loglib->logError('Error while sending an email');
-						// Writing errors in tbl_msg_recipient
-						$sme = $this->setMessageError(
-							$result->retval[0]->message_id,
-							$result->retval[0]->receiver_id,
-							'Error while sending an email',
-							$result->retval[0]->sentinfo
-						);
-						if (!$sme)
-						{
-							$this->_ci->loglib->logError('Error while updating DB');
-						}
-					}
-					else
-					{
-						// Setting the message as sent in DB
-						$sent = $this->setMessageSent($result->retval[0]->message_id, $result->retval[0]->receiver_id);
-						// If the email has been sent and the DB updated
-						if (!$sent)
-						{
-							$this->_ci->loglib->logError('Error while updating DB');
-						}
-					}
-				}
-				else
-				{
-					$this->_ci->loglib->logError('This person does not have an email account');
-					// Writing errors in tbl_msg_recipient
-					$sme = $this->setMessageError(
-						$result->retval[0]->message_id,
-						$result->retval[0]->receiver_id,
-						'This person does not have an email account',
-						$result->retval[0]->sentinfo
-					);
-					if (!$sme)
-					{
-						$this->_ci->loglib->logError('Error while updating DB');
-					}
-					$sent = true; // Non blocking error
-				}
-			}
-			else
-			{
-				$this->_ci->loglib->logInfo('There are no email to be sent');
-				$sent = false;
-			}
-		}
-		else
-		{
-			$this->_ci->loglib->logError('Something went wrong while getting data from DB');
-			$sent = false;
-		}
-
-		return $sent;
-	}
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods used by to build the GUI to write messages to user/s
 
 	/**
-	 * parseMessageText
-	 */
-	public function parseMessageText($text, $data = array())
-	{
-		return $this->_ci->parser->parse_string($text, $data, true);
-	}
-
-	/**
-	 * Gets data for Person from view vw_msg_vars_person
-	 * @param $person_id
+	 * Retrieves message vars from view vw_msg_vars_person
 	 */
 	public function getMessageVarsPerson()
 	{
-		$variablesArray = array();
+		// Retrieves message vars from view vw_msg_vars_person
+		$messageVarsPerson = $this->_ci->MessageModel->getMessageVarsPerson();
+		if (isSuccess($messageVarsPerson)) // if everything is ok
+		{
+			$variablesArray = array();
+			$tmpVariablesArray = getData($messageVarsPerson);
 
-		$variables = $this->_ci->MessageModel->getMessageVarsPerson();
-		if (isError($variables))
-		{
-			return $variables;
-		}
-		elseif (hasData($variables))
-		{
-			$tmpVariablesArray = getData($variables);
-			// Skip person_id
+			// Starts from 1 to skip the first element which is person_id
 			for ($i = 1; $i < count($tmpVariablesArray); $i++)
 			{
 				$variablesArray['{'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}'] = $tmpVariablesArray[$i];
 			}
+
+			return success($variablesArray);
 		}
 
-		return success($variablesArray);
+		return $messageVarsPerson; // otherwise returns the error
 	}
 
 	/**
-	 * A person may belongs to more organisation units
+	 * Retrieves organisation units for each role that a user plays inside that organisation unit
 	 */
 	public function getOeKurzbz($sender_id)
 	{
-		$oe_kurzbz = array();
-
-		$this->_ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
+		// Retrieves organisation units for a user from database
  		$benutzer = $this->_ci->BenutzerfunktionModel->getByPersonId($sender_id);
-		if (isError($benutzer))
-		{
-			return $benutzer;
-		}
- 		elseif (hasData($benutzer))
+ 		if (isSuccess($benutzer)) // if everything is ok
  		{
- 			foreach (getData($benutzer) as $val)
- 			{
- 				$oe_kurzbz[] = $val->oe_kurzbz;
- 			}
+			$ouArray = array();
+
+			// Copies organisation units in $ouArray array
+ 			foreach (getData($benutzer) as $val) $ouArray[] = $val->oe_kurzbz;
+
+			return success($ouArray);
  		}
 
-		return success($oe_kurzbz);
+		return $benutzer; // otherwise returns the error
 	}
 
 	/**
@@ -806,55 +376,172 @@ class MessageLib
 	 */
 	public function getIsAdmin($sender_id)
 	{
-		$this->_ci->load->model('system/Benutzerrolle_model', 'BenutzerrolleModel');
-
  		return $this->_ci->BenutzerrolleModel->isAdminByPersonId($sender_id);
 	}
 
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods used by REST API
+
+	/**
+	 * Return all messages, including the latest status for specified user. It don´t returns Attachments.
+	 * The sender organisation unit may be specified to filter messages
+	 */
+	public function getMessagesByUID($uid, $senderOU = null, $all = false)
+	{
+		if (isEmptyString($uid)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+
+		return $this->_ci->RecipientModel->getMessagesByUID($uid, $senderOU, $all);
+	}
+
+	/**
+	 * Return all messages, including the latest status for specified user. It does not return attachments
+	 * The sender organisation unit may be specified to filter messages
+	 */
+	public function getMessagesByPerson($person_id, $senderOU = null, $all = false)
+	{
+		if (!is_numeric($person_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+
+		return $this->_ci->RecipientModel->getMessagesByPerson($person_id, $senderOU, $all);
+	}
+
+	/**
+	 * Get all sent messages from a person identified by person_id
+	 * The sender organisation unit may be specified to filter messages
+	 */
+	public function getSentMessagesByPerson($person_id, $senderOU = null, $all = false)
+	{
+		if (!is_numeric($person_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+
+		return $this->_ci->MessageModel->getMessagesByPerson($person_id, $senderOU, $all);
+	}
+
+	/**
+	 * Retrieves a message by its token
+	 * If a message is found with the given token then this message is set as read
+	 */
+	public function getMessageByToken($token)
+	{
+		if (isEmptyString($token)) return error('The given token is not valid', MSG_ERR_INVALID_TOKEN);
+
+		$result = $this->_ci->RecipientModel->getMessageByToken($token);
+		if (hasData($result))
+		{
+			// Searches for a status that is NOT unread
+			$found = false;
+
+			foreach (getData($result) as $message)
+			{
+				if ($message->status > MSG_STATUS_UNREAD)
+				{
+					$found = true;
+					break;
+				}
+			}
+
+			// If NOT found then insert the read status
+			if (!$found)
+			{
+				$statusData = array(
+					'message_id' => getData($result)[0]->message_id,
+					'person_id' => getData($result)[0]->receiver_id,
+					'status' => MSG_STATUS_READ
+				);
+
+				$resultIns = $this->_ci->MsgStatusModel->insert($statusData);
+				// If an error occured while writing on data base, then return it
+				if (isError($resultIns)) $result = $resultIns;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Counts the unread messages for the given user
+	 * The sender organisation unit may be specified to filter messages
+	 */
+	public function getCountUnreadMessages($person_id, $senderOU = null)
+	{
+		if (!is_numeric($person_id)) return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
+
+		return $this->_ci->RecipientModel->getCountUnreadMessages($person_id, $senderOU);
+	}
+
+	/**
+	 * Change the message status of the given message specified by message_id and person_id, using the given status
+	 * NOTE: it performs an insert NOT an update
+	 */
+	public function updateMessageStatus($message_id, $person_id, $status)
+	{
+		if (!is_numeric($message_id)) return error('The given message id is not valid', MSG_ERR_INVALID_MSG_ID);
+		if (!is_numeric($person_id)) return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
+		if (!is_numeric($status)) return error('The given status is not valid', MSG_ERR_INVALID_STATUS_ID);
+
+		$this->_ci->MsgStatusModel->resetQuery(); // Reset an eventually already buit query
+
+		// Searches if the status is already present
+		$result = $this->_ci->MsgStatusModel->load(array($message_id, $person_id, $status));
+		if (!hasData($result)) // if not found
+		{
+			// Insert the new status
+			$statusKey = array(
+				'message_id' => $message_id,
+				'person_id' => $person_id,
+				'status' => $status
+			);
+			$result = $this->_ci->MsgStatusModel->insert($statusKey);
+		}
+
+		return $result;
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
 	/**
-	 * Update the table tbl_msg_recipient
+	 *
 	 */
-	private function _updateMessageRecipient($message_id, $receiver_id, $parameters)
+	private function _getSender($sender_id)
 	{
-		$updated = false;
-
-		// Updates table tbl_msg_recipient
-		$resultUpdate = $this->_ci->RecipientModel->update(array($receiver_id, $message_id), $parameters);
-		// Checks if errors were occurred
-		if (isSuccess($resultUpdate) && is_array($resultUpdate->retval))
+		// By default the sender is defined in message configuration
+		$sender = success($this->_ci->config->item(self::CFG_SYSTEM_PERSON_ID));
+		if ($sender_id != null) // if it was given as parameter
 		{
-			$updated = true;
+			if (is_numeric($sender_id)) // if it valid -> it is a number
+			{
+				$sender = success($sender_id); // return it as a success object
+			}
+			else
+			{
+				// Otherwise returns an error
+				$sender = error('The given sender is not valid', MSG_ERR_INVALID_SENDER);
+			}
 		}
 
-		return $updated;
+		return $sender;
 	}
 
 	/**
-	 * Changes the status of the message from unsent to sent
+	 * Checks if the given receiver ids belong to persons in database
 	 */
-	private function setMessageSent($message_id, $receiver_id)
+	private function _getReceiversByPersonId($receiver_id)
 	{
-		$parameters = array('sent' => 'NOW()', 'sentinfo' => null);
+		// Reset an eventually already buit query
+		$this->_ci->PersonModel->resetQuery();
 
-		return $this->_updateMessageRecipient($message_id, $receiver_id, $parameters);
-	}
+		// Get only this columns
+		$this->_ci->PersonModel->addSelect('person_id');
 
-	/**
-	 * Sets the sentInfo with the error
-	 */
-	private function setMessageError($message_id, $receiver_id, $sentInfo, $prevSentInfo = null)
-	{
-		if (!is_null($prevSentInfo) && $prevSentInfo != '')
+		// Loads from database the person by its person_id
+		$personResult = $this->_ci->PersonModel->load($receiver_id);
+		if (hasData($personResult)) // if data are retrieved
 		{
-			$sentInfo = $prevSentInfo.SENT_INFO_NEWLINE.$sentInfo;
+			return $personResult; // return them
+		}
+		else // otherwise an error occurred (blocking error or data not found)
+		{
+			return error('The given person id is not valid', MSG_ERR_INVALID_RECIPIENTS);
 		}
-
-		$parameters = array('sent' => null, 'sentinfo' => $sentInfo);
-
-		return $this->_updateMessageRecipient($message_id, $receiver_id, $parameters);
 	}
 
 	/**
@@ -869,92 +556,49 @@ class MessageLib
 		// Get all the valid receivers id using the oe_kurzbz
 		$receivers = $this->_ci->BenutzerfunktionModel->loadWhere(
 			'oe_kurzbz = '.$this->_ci->db->escape($oe_kurzbz).
-			' AND funktion_kurzbz = '.$this->_ci->db->escape($this->_ci->config->item('assistent_function')).
+			' AND funktion_kurzbz = '.$this->_ci->db->escape($this->_ci->config->item(self::CFG_OU_RECEIVERS)).
 			' AND (NOW() BETWEEN COALESCE(datum_von, NOW()) AND COALESCE(datum_bis, NOW()))'
 		);
-
 		return $receivers;
 	}
 
 	/**
-	 * Gets the receivers id
+	 * Save a new message in DB
 	 */
-	private function _getReceivers($receiver_id, $oe_kurzbz = null)
+	private function _saveMessage($sender_id, $senderOU, $receiver_id, $receiverOU, $subject, $body, $priority, $relationmessage_id)
 	{
-		$receivers = null;
-
-		// If no receiver_id is given...
-		if (is_null($receiver_id))
-		{
-			// ...a oe_kurzbz must be specified
-			if (is_null($oe_kurzbz))
-			{
-				$receivers = $this->_error('', MSG_ERR_INVALID_OU);
-			}
-			else
-			{
-				$receivers = $this->_getReceiversByOekurzbz($oe_kurzbz);
-			}
-		}
-		// Else if the receiver id is given
-		else
-		{
-			$receivers = $this->_success(array(new stdClass()));
-			$receivers->retval[0]->person_id = $receiver_id;
-		}
-
-		return $receivers;
-	}
-
-	/**
-	 * Checks if the given receiver id is a valid person
-	 */
-	private function _checkReceiverId($receiver_id)
-	{
-		// Load Person_model
-		$this->_ci->load->model('person/Person_model', 'PersonModel');
-		$result = $this->_ci->PersonModel->load($receiver_id);
-		if (hasData($result))
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Save a message in DB
-	 **/
-	private function _saveMessage($sender_id, $receiver_id, $subject, $body, $relationmessage_id, $oe_kurzbz)
-	{
-		// Starts db transaction
+		// Starts database transaction
 		$this->_ci->db->trans_start(false);
 
-		// Save Message
-		$msgData = array(
+		// Store message information in tbl_msg_message
+		$messageData = array(
 			'person_id' => $sender_id,
 			'subject' => $subject,
 			'body' => $body,
-			'priority' => PRIORITY_NORMAL,
+			'priority' => $priority,
 			'relationmessage_id' => $relationmessage_id,
-			'oe_kurzbz' => $oe_kurzbz
+			'oe_kurzbz' => $senderOU
 		);
-		$result = $this->_ci->MessageModel->insert($msgData);
+
+		$result = $this->_ci->MessageModel->insert($messageData);
 		if (isSuccess($result))
 		{
-			// Link the message with the receiver
-			$msg_id = $result->retval;
+			$messageId = getData($result); // Gets the message id generated by database
+
+			// Store message information in tbl_msg_recipient
 			$recipientData = array(
 				'person_id' => $receiver_id,
-				'message_id' => $msg_id,
-				'token' => generateToken()
+				'message_id' => $messageId,
+				'token' => generateToken(),
+				'oe_kurzbz' => $receiverOU
 			);
+
 			$result = $this->_ci->RecipientModel->insert($recipientData);
 			if (isSuccess($result))
 			{
-				// Save message status
+				// Store message information in tbl_msg_status
 				$statusData = array(
-					'message_id' => $msg_id,
+					'message_id' => $messageId,
 					'person_id' => $receiver_id,
 					'status' => MSG_STATUS_UNREAD
 				);
@@ -962,35 +606,262 @@ class MessageLib
 			}
 		}
 
-		$this->_ci->db->trans_complete();
+		$this->_ci->db->trans_complete(); // Ends database transaction
 
+		// If the transaction failed...
 		if ($this->_ci->db->trans_status() === false || isError($result))
 		{
-			$this->_ci->db->trans_rollback();
-			$result = $this->_error('An error occurred while saving a message', EXIT_ERROR);
+			$this->_ci->db->trans_rollback(); // ...then rollback
 		}
-		else
+		else // otherwise commit...
 		{
 			$this->_ci->db->trans_commit();
-			$result = $this->_success($msg_id);
+			$result = success($messageId); // ...and returns the message id
 		}
 
 		return $result;
 	}
 
 	/**
-	 * Wrapper for function error
+	 * Set the message as sent successfully by setting columns 'sent' and 'sentinfo' of table tbl_msg_recipient
+	 * sent column is set with date of delivery
+	 * sentinfo is set to null
 	 */
-	private function _error($retval, $code)
+	private function _setSentSuccess($message_id, $receiver_id)
 	{
-		return error($retval, $code);
+		return $this->_ci->RecipientModel->update(array($receiver_id, $message_id), array('sent' => 'NOW()', 'sentinfo' => null));
 	}
 
 	/**
-	 * Wrapper for function success
+	 * Set the message as sent with error by setting columns 'sent' and 'sentinfo' of table tbl_msg_recipient
+	 * Stores the type of error in 'sentinfo' column keeping en eventual previous error
+	 * sent column is set to null
 	 */
-	private function _success($retval, $code = null)
+	private function _setSentError($message_id, $receiver_id, $sentInfo, $prevSentInfo)
 	{
-		return success($retval, $code);
+		if (!isEmptyString($prevSentInfo))
+		{
+			$sentInfo .= self::SENT_INFO_NEWLINE.$prevSentInfo;
+		}
+
+		return $this->_ci->RecipientModel->update(array($receiver_id, $message_id), array('sent' => null, 'sentinfo' => $sentInfo));
+	}
+
+	/**
+	 * Returns the notice body. Tries to use the template present in database and then falling back
+	 * on the one present in filesystem. If both fail then an error is returned
+	 */
+	private function _getNoticeBody($viewMessageLink, $subject, $body, $dbTemplateName, $fsTemplateName)
+	{
+		$noticeBody = null;
+
+		$vorlageResult = $this->_ci->vorlagelib->loadVorlagetext($dbTemplateName);
+
+		if (isError($vorlageResult)) return $vorlageResult;
+
+		if (hasData($vorlageResult))
+		{
+			$vorlage = getData($vorlageResult)[0];
+
+			$noticeBody = parseText(
+				$vorlage->text,
+				array(
+					'href' => $viewMessageLink,
+					'subject' => $subject,
+					'body' => $body
+				)
+			);
+		}
+		else
+		{
+			$noticeBody = parseTemplate(
+				$fsTemplateName,
+				array(
+					'href' => $viewMessageLink,
+					'subject' => $subject,
+					'body' => $body
+				)
+			);
+		}
+
+		if (isEmptyString($noticeBody)) return error('An error occurred while generating the notice body');
+
+		return success($noticeBody);
+	}
+
+	/**
+	 * Returns the notice HTML body try to using the template present in database and then falling back
+	 * on the one present in filesystem. If both fail then an error is returned
+	 */
+	private function _getNoticeHTMLBody($viewMessageLink, $subject, $body)
+	{
+		return $this->_getNoticeBody($viewMessageLink, $subject, $body, self::NOTICE_TEMPLATE_HTML, self::NOTICE_TEMPLATE_FALLBACK_HTML);
+	}
+
+	/**
+	 * Returns the notice TXT body try to using the template present in database and then falling back
+	 * on the one present in filesystem. If both fail then an error is returned
+	 */
+	private function _getNoticeTXTBody($viewMessageLink, $subject, $body)
+	{
+		return $this->_getNoticeBody($viewMessageLink, $subject, $body, self::NOTICE_TEMPLATE_TXT, self::NOTICE_TEMPLATE_FALLBACK_TXT);
+	}
+
+	/**
+	 * Sends a notice email that notices to a user about a new received message
+	 */
+	private function _sendNotice($message_id)
+	{
+		// Get the message and related data (sender, recipient, etc...)
+		$messageResult = $this->_ci->RecipientModel->getMessages(
+			self::EMAIL_KONTAKT_TYPE,
+			1,
+			$message_id
+		);
+
+		if (isError($messageResult)) return $messageResult; // if an error occured then return it
+		if (!hasData($messageResult)) return error('No data found with the given message id'); // if no data found then return an error
+
+		$messageData = getData($messageResult)[0]; // Message data from database
+
+		// Checks if this person has a valid email address where to send the notice email
+		if (isEmptyString($messageData->receiver) && isEmptyString($messageData->employeecontact))
+		{
+			// Set in database why this email is NOT going to be send
+			$sse = $this->_setSentError(
+				$message_id,
+				$messageData->receiver_id,
+				'This person does not have an email account',
+				$messageData->sentinfo
+			);
+
+			// If database error occurred then return it, otherwise return a logic error
+			return isError($sse) ? $sse : error('This person does not have an email account');
+		}
+
+		// Create a link to the controller to view the message using a token
+		$viewMessageLink = $this->_ci->config->item(self::CFG_MESSAGE_SERVER).
+			$this->_ci->config->item(self::CFG_MESSAGE_HTML_VIEW_URL).
+			$messageData->token;
+
+		// Generates notice email body in HTML and plain text version.
+		// If an error occured during the generation then the error itself is returned
+		$noticeHTMLBody = $this->_getNoticeHTMLBody($viewMessageLink, $messageData->subject, $messageData->body);
+		if (isError($noticeHTMLBody)) return $noticeHTMLBody;
+		$noticeTXTBody = $this->_getNoticeTXTBody($viewMessageLink, $messageData->subject, $messageData->body);
+		if (isError($noticeTXTBody)) return $noticeTXTBody;
+
+		// If an employeecontact contact is present then use it, otherwise use the personal contacts
+		$receiverContact = $messageData->receiver;
+		if (!isEmptyString($messageData->employeecontact)) $receiverContact = $messageData->employeecontact.'@'.DOMAIN;
+
+		// Sending email
+		$sent = $this->_ci->maillib->send(
+			null,
+			$receiverContact,
+			$messageData->subject,
+			getData($noticeHTMLBody),
+			null,
+			null,
+			null,
+			getData($noticeTXTBody)
+		);
+
+		// If errors occurred while sending the email
+		if (!$sent)
+		{
+			// Set in database why this email is NOT going to be send
+			$sse = $this->_setSentError(
+				$message_id,
+				$messageData->receiver_id,
+				'An error occurred while sending the email',
+				$messageData->sentinfo
+			);
+
+			// If database error occurred then return it, otherwise return a logic error
+			return isError($sse) ? $sse : error('An error occurred while sending the email');
+		}
+		else // success!
+		{
+			// Set in database that the notice email was succesfully sent
+			$sss = $this->_setSentSuccess($message_id, $messageData->receiver_id);
+			if (isError($sss)) return $sss; // If database error occurred then return it
+		}
+
+		return success('Notice email sent successfully');
+	}
+
+	/**
+	 * Sends new message core method, may be wrapped by other methods.
+	 */
+	private function _sendMessage(
+		$receivers, $receiversOU, $subject, $body, $sender_id, $senderOU, $relationmessage_id, $priority, $multiPartMime
+	)
+	{
+		// Checks if sender is fine
+		$sender = $this->_getSender($sender_id);
+		if (!hasData($sender)) return $sender;
+		// Checks if the sender and receiver organisation unit are valid
+		if (($receiversOU != null && !$this->_ouExists($receiversOU)) || ($senderOU != null && !$this->_ouExists($senderOU)))
+		{
+			return error('The given organisation unit is not valid', MSG_ERR_INVALID_OU);
+		}
+		// Checks subjects
+		if (isEmptyString($subject)) return error('The given subject is an empty string', MSG_ERR_INVALID_SUBJECT);
+		// Checks body
+		if (isEmptyString($body)) return error('The given body is an empty string', MSG_ERR_INVALID_BODY);
+
+		$savedMessages = array(); // This array contains all the message ids of the saved messages
+
+		// Looping on receivers
+		foreach (getData($receivers) as $receiver)
+		{
+			// Save message in database
+			$saveMessageResult = $this->_saveMessage(
+				getData($sender), $senderOU, $receiver->person_id, $receiversOU, $subject, $body, $priority, $relationmessage_id
+			);
+			if (isSuccess($saveMessageResult)) // If successfully saved
+			{
+				// If the system is configured to send messages immediately
+				if ($this->_ci->config->item(self::CFG_SEND_IMMEDIATELY) === true)
+				{
+					$savedMessages[] = getData($saveMessageResult); // store the message id of the saved message
+				}
+			}
+			else
+			{
+				return $saveMessageResult; // If an error occured while saving
+			}
+		}
+
+		// If the system is configured to send messages immediately
+		if ($this->_ci->config->item(self::CFG_SEND_IMMEDIATELY) === true)
+		{
+			// Looping through saved messages ids
+			foreach ($savedMessages as $message_id)
+			{
+				// Send message notice via email!
+				$sendNotice = $this->_sendNotice($message_id);
+				// If an error occurred then return it
+				if (isError($sendNotice)) return $sendNotice;
+			}
+		}
+
+		return success('Message sent successfully');
+	}
+
+	/**
+	 * Checks if the given organisation unit exists in database
+	 */
+	private function _ouExists($ou)
+	{
+		// Reset an eventually already buit query
+		$this->_ci->OrganisationseinheitModel->resetQuery();
+		// Get only this columns
+		$this->_ci->OrganisationseinheitModel->addSelect('oe_kurzbz');
+		// Retrieves the given organisation unit from database
+		$ouResults = $this->_ci->OrganisationseinheitModel->loadWhere(array('oe_kurzbz' => $ou));
+
+		return hasData($ouResults);
 	}
 }
diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php
index 5f3f40e6d..c17d608c7 100644
--- a/application/models/CL/Messages_model.php
+++ b/application/models/CL/Messages_model.php
@@ -38,19 +38,29 @@ class Messages_model extends CI_Model
 
 		$sender_id = getData($authUser)[0]->person_id;
 
+
 		// Send message(s)
 		if (hasData($msgVarsData))
 		{
 			for ($i = 0; $i < count(getData($msgVarsData)); $i++)
 			{
-				$parsedText = "";
+				$parsedText = '';
 				$msgVarsDataArray = $this->replaceKeys((array)getData($msgVarsData)[$i]); // replaces array keys
 
 				// Send without vorlage
 				if (isEmptyString($vorlage_kurzbz))
 				{
-					$parsedText = $this->messagelib->parseMessageText($body, $msgVarsDataArray);
-					$msg = $this->messagelib->sendMessage($sender_id, $msgVarsDataArray['person_id'], $subject, $parsedText, PRIORITY_NORMAL, $relationmessage_id, $oe_kurzbz);
+					$parsedText = parseText($body, $msgVarsDataArray);
+
+					$msg = $this->messagelib->sendMessageUser(
+						$msgVarsDataArray['person_id'],	// receiverPersonId
+						$subject,						// subject
+						$parsedText,					// body
+						$sender_id,						// sender_id
+						$oe_kurzbz,						// senderOU
+						$relationmessage_id,			// relationmessage_id
+						MSG_PRIORITY_NORMAL				// priority
+					);
 				}
 				// Send with vorlage
 				else
@@ -63,7 +73,15 @@ class Messages_model extends CI_Model
 							$msgVarsDataArray[$key] = $msgvar;
 						}
 					}
-					$msg = $this->messagelib->sendMessageVorlage($sender_id, $msgVarsDataArray['person_id'], $vorlage_kurzbz, $oe_kurzbz, $msgVarsDataArray);
+
+					$msg = $this->messagelib->sendMessageUserTemplate(
+						$msgVarsDataArray['person_id'],			// receiversPersonId
+						$vorlage_kurzbz,						// vorlage
+						$msgVarsDataArray,						// parseData
+						null,									// orgform
+						$sender_id,								// sender_id
+						$oe_kurzbz								// senderOU
+					);
 				}
 
 				if (isError($msg)) return $msg;
@@ -95,7 +113,7 @@ class Messages_model extends CI_Model
 	}
 
 	/**
-	 * Send a reply
+	 * Send a reply to a message accessed using a token
 	 */
 	public function sendReply($subject, $body, $persons, $relationmessage_id, $token)
 	{
@@ -116,7 +134,16 @@ class Messages_model extends CI_Model
 			{
 				$dataArray = (array)getData($data)[$i];
 
-				$msg = $this->messagelib->sendMessage($sender_id, $dataArray['person_id'], $subject, $body, PRIORITY_NORMAL, $relationmessage_id, null);
+				$msg = $this->messagelib->sendMessageUser(
+					$dataArray['person_id'],		// receiverPersonId
+					$subject,						// subject
+					$body,							// body
+					$sender_id,						// sender_id
+					null,							// senderOU
+					$relationmessage_id,			// relationmessage_id
+					MSG_PRIORITY_NORMAL				// priority
+				);
+
 				if (isError($msg)) return $msg;
 
 				// Logs person data
diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php
index 74a1c3256..49fc21fc4 100644
--- a/application/models/system/Recipient_model.php
+++ b/application/models/system/Recipient_model.php
@@ -242,7 +242,7 @@ class Recipient_model extends DB_Model
 		if (is_numeric($message_id))
 		{
 			array_push($parametersArray, $message_id);
-			$query .= ' AND mm.message_id = ?';
+			$query .= ' WHERE mm.message_id = ?';
 		}
 
 		$query .= ' ORDER BY mr.insertamum ASC';