diff --git a/application/controllers/ViewMessage.php b/application/controllers/ViewMessage.php
index a3fc1acba..7d4a8d265 100644
--- a/application/controllers/ViewMessage.php
+++ b/application/controllers/ViewMessage.php
@@ -81,7 +81,7 @@ class ViewMessage extends FHC_Controller
 				'href' => $href
 			);
 
-			$this->load->view('system/messageHTML.php', $data);
+			$this->load->view('system/messages/messageHTML.php', $data);
 		}
 	}
 
@@ -94,7 +94,7 @@ class ViewMessage extends FHC_Controller
 
 		if (isEmptyString($token))
 		{
-			show_error('no token supplied');
+			show_error('No token supplied');
 		}
 
 		$msg = null;
@@ -104,7 +104,7 @@ class ViewMessage extends FHC_Controller
 
 		if (!hasData($msg))
 		{
-			show_error('no message found');
+			show_error('No message found');
 		}
 
 		$msg = $msg->retval[0];
@@ -114,7 +114,7 @@ class ViewMessage extends FHC_Controller
 
 		if (!hasData($receiverData))
 		{
-			show_error('no sender found');
+			show_error('No sender found');
 		}
 
 		$data = array (
@@ -123,7 +123,7 @@ class ViewMessage extends FHC_Controller
 			'token' => $token
 		);
 
-		$this->load->view('system/messageWriteReply', $data);
+		$this->load->view('system/messages/messageWriteReply', $data);
 	}
 
 	/**
@@ -210,7 +210,7 @@ class ViewMessage extends FHC_Controller
 
 		if (!$error)
 		{
-			$this->load->view('system/messageSent');
+			$this->load->view('system/messages/messageSent');
 		}
 	}
 }
diff --git a/application/controllers/system/FASMessages.php b/application/controllers/system/FASMessages.php
index 60f961c8b..6c01f73a8 100644
--- a/application/controllers/system/FASMessages.php
+++ b/application/controllers/system/FASMessages.php
@@ -63,7 +63,7 @@ class FASMessages extends Auth_Controller
  			'isAdmin' => $isAdmin
  		);
 
- 		$this->load->view('system/messageWrite', $data);
+ 		$this->load->view('system/messages/messageWrite', $data);
  	}
 
 	/**
@@ -109,7 +109,7 @@ class FASMessages extends Auth_Controller
  			'isAdmin' => $isAdmin
  		);
 
- 		$this->load->view('system/messageWrite', $data);
+ 		$this->load->view('system/messages/messageWrite', $data);
  	}
 
 	// -----------------------------------------------------------------------------------------------------------------
diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php
index 94c0eb756..723fedd69 100644
--- a/application/controllers/system/Messages.php
+++ b/application/controllers/system/Messages.php
@@ -66,7 +66,7 @@ class Messages extends Auth_Controller
 			'isAdmin' => $isAdmin
 		);
 
-		$this->load->view('system/messageWrite', $data);
+		$this->load->view('system/messages/messageWrite', $data);
 	}
 
 	/**
@@ -146,11 +146,6 @@ class Messages extends Auth_Controller
 			{
 				$parsedText = "";
 				$dataArray = (array)$data->retval[$i];
-				foreach ($dataArray as $key => $val)
-				{
-					$newKey = str_replace(" ", "_", strtolower($key));
-					$dataArray[$newKey] = $dataArray[$key];
-				}
 
 				// if oe not given, get from prestudent
 				if (isEmptyString($oe_kurzbz) && hasData($prestudentsData))
@@ -175,7 +170,7 @@ class Messages extends Auth_Controller
 				{
 					if (isset($msgvars) && is_array($msgvars))
 					{
-						//additional message variables
+						// additional message variables
 						foreach ($msgvars as $key => $msgvar)
 						{
 							$dataArray[$key] = $msgvar;
@@ -208,6 +203,7 @@ class Messages extends Auth_Controller
 				);
 
 			}
+
 			return success('success');
 		}
 	}
@@ -218,14 +214,27 @@ class Messages extends Auth_Controller
 	public function getVorlage()
 	{
 		$vorlage_kurzbz = $this->input->get('vorlage_kurzbz');
+		$result = null;
 
-		if (isset($vorlage_kurzbz))
+		if (!isEmptyString($vorlage_kurzbz))
 		{
 			$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
 			$this->VorlagestudiengangModel->addOrder('version','DESC');
-			$result = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
 
-			$this->outputJsonSuccess($result);
+			$result = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
+		}
+		else
+		{
+			$result = error('The given vorlage_kurzbz is not valid');
+		}
+
+		if (isError($result) || !hasData($result))
+		{
+			$this->outputJsonError($result->retval);
+		}
+		else
+		{
+			$this->outputJsonSuccess($result->retval);
 		}
 	}
 
@@ -234,7 +243,6 @@ class Messages extends Auth_Controller
 	 */
 	public function parseMessageText()
 	{
-		$prestudent_id = $this->input->get('prestudent_id');
 		$person_id = $this->input->get('person_id');
 		$text = $this->input->get('text');
 		$parsedText = '';
@@ -244,25 +252,18 @@ class Messages extends Auth_Controller
 		{
 			$data = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
 		}
-		elseif (is_numeric($prestudent_id))
+		else
 		{
-			$data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+			$data = error('The given person_id is not a valid number');
 		}
 
-		if (is_error($data) || !hasData($data))
+		if (isError($data) || !hasData($data))
 		{
 			$this->outputJsonError($data->retval);
 		}
 		else
 		{
-			$dataArray = (array)$data->retval[0];
-			foreach ($dataArray as $key => $val)
-			{
-				$newKey = str_replace(" ", "_", strtolower($key));
-				$dataArray[$newKey] = $dataArray[$key];
-			}
-
-			$parsedText = $this->messagelib->parseMessageText($text, $dataArray);
+			$parsedText = $this->messagelib->parseMessageText($text, (array)$data->retval[0]);
 
 			$this->outputJsonSuccess($parsedText);
 		}
diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php
index 67c5d24f9..070750b7c 100644
--- a/application/controllers/system/Phrases.php
+++ b/application/controllers/system/Phrases.php
@@ -16,7 +16,6 @@ class Phrases extends Auth_Controller
 				'view' => 'system/phrase:r',
 				'deltext' => 'system/phrase:rw',
 				'edit' => 'system/phrase:rw',
-				'write' => 'system/phrase:rw',
 				'save' => 'system/phrase:rw',
 				'newText' => 'system/phrase:rw',
 				'editText' => 'system/phrase:rw',
@@ -115,19 +114,6 @@ class Phrases extends Auth_Controller
 		$this->load->view('system/phrases/phrasesEdit', $data);
 	}
 
-	/**
-	 *
-	 */
-	public function write()
-	{
-		$data = array(
-			'subject' => 'TestSubject',
-			'body' => 'TestDevelopmentBodyText'
-		);
-
-		$this->load->view('system/messageWrite', $data);
-	}
-
 	/**
 	 *
 	 */
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index e59f45d2d..035c93eb8 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -760,7 +760,15 @@ class MessageLib
 	 */
 	public function parseMessageText($text, $data = array())
 	{
-		return $this->_ci->parser->parse_string($text, $data, true);
+		$tmpData = array();
+
+		// Replaces data array keys to a lowercase without spaces string
+		foreach ($data as $key => $val)
+		{
+			$tmpData[str_replace(' ', '_', strtolower($key))] = $data[$key];
+		}
+
+		return $this->_ci->parser->parse_string($text, $tmpData, true);
 	}
 
 	/**
diff --git a/application/views/system/messageForm.php b/application/views/system/messages/messageForm.php
similarity index 100%
rename from application/views/system/messageForm.php
rename to application/views/system/messages/messageForm.php
diff --git a/application/views/system/messageHTML.php b/application/views/system/messages/messageHTML.php
similarity index 100%
rename from application/views/system/messageHTML.php
rename to application/views/system/messages/messageHTML.php
diff --git a/application/views/system/messageList.php b/application/views/system/messages/messageList.php
similarity index 100%
rename from application/views/system/messageList.php
rename to application/views/system/messages/messageList.php
diff --git a/application/views/system/messageSent.php b/application/views/system/messages/messageSent.php
similarity index 100%
rename from application/views/system/messageSent.php
rename to application/views/system/messages/messageSent.php
diff --git a/application/views/system/messageWrite.php b/application/views/system/messages/messageWrite.php
similarity index 99%
rename from application/views/system/messageWrite.php
rename to application/views/system/messages/messageWrite.php
index 5d17f85b3..93caaf861 100644
--- a/application/views/system/messageWrite.php
+++ b/application/views/system/messages/messageWrite.php
@@ -4,7 +4,9 @@ $this->load->view(
 	array(
 		'title' => 'Write a message',
 		'jquery' => true,
+		'jqueryui' => true,
 		'bootstrap' => true,
+		'ajaxlib' => true,
 		'fontawesome' => true,
 		'tinymce' => true,
 		'sbadmintemplate' => true,
diff --git a/application/views/system/messageWriteReply.php b/application/views/system/messages/messageWriteReply.php
similarity index 96%
rename from application/views/system/messageWriteReply.php
rename to application/views/system/messages/messageWriteReply.php
index 0987b6226..b520035ae 100644
--- a/application/views/system/messageWriteReply.php
+++ b/application/views/system/messages/messageWriteReply.php
@@ -26,7 +26,7 @@ $href = site_url().'/ViewMessage/sendReply';
 				</div>
 			</div>
 			<form id="sendForm" method="post" action="<?php echo $href; ?>">
-				<?php $this->load->view('system/messageForm.php'); ?>
+				<?php $this->load->view('system/messages/messageForm.php'); ?>
 				<?php
 				for ($i = 0; $i < count($receivers); $i++)
 				{
diff --git a/public/js/AjaxLib.js b/public/js/AjaxLib.js
index b47654041..47cc2b67f 100644
--- a/public/js/AjaxLib.js
+++ b/public/js/AjaxLib.js
@@ -146,10 +146,7 @@ var FHC_AjaxClient = {
 
 		if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE))
 	    {
-	        if (response.error == SUCCESS)
-	        {
-	            isSuccess = true;
-	        }
+	        code = response.error;
 	    }
 
 		return code;
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 17f73c51e..9894573ee 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -1,4 +1,6 @@
-const CONTROLLER_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/Messages";
+/**
+ * JS used by view system/messages/messageWrite
+ */
 
 function tinymcePreviewSetContent()
 {
@@ -17,22 +19,26 @@ function tinymcePreviewSetContent()
 
 function parseMessageText(receiver_id, text)
 {
-	$.ajax({
-		dataType: "json",
-		url: CONTROLLER_URL + "/parseMessageText",
-		data: {
-			"person_id": receiver_id,
-			"text": text
-		},
-		success: function(data, textStatus, jqXHR)
+	FHC_AjaxClient.ajaxCallGet(
+		"system/Messages/parseMessageText",
 		{
-			tinyMCE.get("tinymcePreview").setContent(data);
+			person_id: receiver_id,
+			text: text
 		},
-		error: function(jqXHR, textStatus, errorThrown)
 		{
-			alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
+			successCallback: function(data, textStatus, jqXHR) {
+
+				if (FHC_AjaxClient.hasData(data))
+				{
+					tinyMCE.get("tinymcePreview").setContent(FHC_AjaxClient.getData(data));
+				}
+				else if (FHC_AjaxClient.isError(data))
+				{
+					alert(data.retval);
+				}
+			}
 		}
-	});
+	);
 }
 
 $(document).ready(function ()
@@ -100,24 +106,28 @@ $(document).ready(function ()
 	{
 		$("#vorlageDnD").change(function ()
 		{
-			if (this.value != '')
+			var vorlage_kurzbz = this.value;
+
+			if (vorlage_kurzbz != '')
 			{
-				$.ajax({
-					dataType: "json",
-					url: CONTROLLER_URL + "/getVorlage",
-					data: {
-						"vorlage_kurzbz": this.value
-					},
-					success: function(data, textStatus, jqXHR)
+				FHC_AjaxClient.ajaxCallGet(
+					"system/Messages/getVorlage",
 					{
-						tinyMCE.get("bodyTextArea").setContent(data.retval[0].text);
-						$("#subject").val(data.retval[0].subject);
+						vorlage_kurzbz: vorlage_kurzbz
 					},
-					error: function(jqXHR, textStatus, errorThrown)
 					{
-						alert(textStatus + " - " + errorThrown);
+						successCallback: function(data, textStatus, jqXHR) {
+
+							if (FHC_AjaxClient.hasData(data))
+							{
+								var msg = FHC_AjaxClient.getData(data);
+
+								tinyMCE.get("bodyTextArea").setContent(msg[0].text);
+								$("#subject").val(msg[0].subject);
+							}
+						}
 					}
-				});
+				);
 			}
 		});
 	}