diff --git a/application/controllers/ViewMessage.php b/application/controllers/ViewMessage.php
index 6794cb2bc..35f5a5b4b 100644
--- a/application/controllers/ViewMessage.php
+++ b/application/controllers/ViewMessage.php
@@ -134,8 +134,6 @@ class ViewMessage extends FHC_Controller
 		$this->load->model('system/Message_model', 'MessageModel');
 		$this->load->library('MessageLib');
 
-		$error = false;
-
 		$subject = $this->input->post('subject');
 		$body = $this->input->post('body');
 		$persons = $this->input->post('persons');
@@ -145,7 +143,6 @@ class ViewMessage extends FHC_Controller
 		if (!isset($relationmessage_id) || $relationmessage_id == '' || !isset($token) || $token == '')
 		{
 			show_error('Error while sending reply');
-			$error = true;
 		}
 
 		$relationmsg = $this->MessageTokenModel->getMessageByToken($token);
@@ -154,7 +151,6 @@ class ViewMessage extends FHC_Controller
 		if (!hasData($relationmsg) || $relationmessage_id !== $relationmsg->retval[0]->message_id)
 		{
 			show_error('Error while sending reply');
-			$error = true;
 		}
 
 		// get sender (receiver of previous msg)
@@ -166,20 +162,16 @@ class ViewMessage extends FHC_Controller
 		// send message(s)
 		if (hasData($data))
 		{
+			// Loads the person log library
+			$this->load->library('PersonLogLib');
+
 			for ($i = 0; $i < count($data->retval); $i++)
 			{
 				$dataArray = (array)$data->retval[$i];
 
 				$msg = $this->messagelib->sendMessage($sender_id, $dataArray['person_id'], $subject, $body, PRIORITY_NORMAL, $relationmessage_id, null);
-				if ($msg->error)
-				{
-					show_error($msg->retval);
-					$error = true;
-					break;
-				}
 
-				// Loads the person log library
-				$this->load->library('PersonLogLib');
+				if ($msg->error) show_error($msg->retval);
 
 				// Write log entry for sender
 				$logtype_kurzbz = 'Action';
@@ -193,7 +185,8 @@ class ViewMessage extends FHC_Controller
 				$oe_kurzbz = null;
 				$insertvon = 'online';
 
-				$this->personloglib->log(
+				// Logs person data
+				$personLog = $this->personloglib->log(
 					$sender_id,
 					$logtype_kurzbz,
 					$logdata,
@@ -203,14 +196,11 @@ class ViewMessage extends FHC_Controller
 					$insertvon
 				);
 
-				//unpark bewerber after he sends message
-				$this->personloglib->unPark($sender_id);
+				// Unpark bewerber after he sends message
+				$personLog = $this->personloglib->unPark($sender_id);
 			}
 		}
 
-		if (!$error)
-		{
-			$this->load->view('system/messages/messageReplySent');
-		}
+		$this->load->view('system/messages/messageReplySent');
 	}
 }
diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php
index 2c1890625..3f407147b 100644
--- a/application/controllers/system/Messages.php
+++ b/application/controllers/system/Messages.php
@@ -124,6 +124,7 @@ class Messages extends Auth_Controller
 		}
 
 		$send = $this->_send($msgVarsData, null, $oe_kurzbz, $vorlage_kurzbz, $msgVars);
+
 		if (isError($send))
 		{
 			$this->outputJsonError($send->retval);
@@ -148,6 +149,7 @@ class Messages extends Auth_Controller
 		$body = $this->input->post('body');
 
 		$authUser = $this->_getAuthUser();
+
 		if (isError($authUser)) return $authUser;
 
 		$sender_id = getData($authUser)[0]->person_id;
@@ -172,7 +174,7 @@ class Messages extends Auth_Controller
 				// Send with vorlage
 				else
 				{
-					if (isset($msgVars) && is_array($msgVars))
+					if (is_array($msgVars))
 					{
 						// Additional message variables
 						foreach ($msgVars as $key => $msgvar)
@@ -186,7 +188,7 @@ class Messages extends Auth_Controller
 				if (isError($msg)) return $msg;
 
 				//write log entry
-				$this->personloglib->log(
+				$personLog = $this->personloglib->log(
 					$msgVarsDataArray['person_id'],
 					'Action',
 					array(
@@ -201,7 +203,11 @@ class Messages extends Auth_Controller
 				);
 			}
 
-			return success('success');
+			return success('Messages sent successfully');
+		}
+		else
+		{
+			return $msgVarsData;
 		}
 	}
 
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 65e81a201..431d0ecd8 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -631,7 +631,7 @@ class InfoCenter extends Auth_Controller
 	public function reloadMessages($person_id)
 	{
 		$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
-		$this->load->view('system/messageList.php', array('messages' => $messages->retval));
+		$this->load->view('system/messages/messageList.php', array('messages' => $messages->retval));
 	}
 
 	/**
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index c59702a65..f29be7127 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -143,7 +143,7 @@
 							<div class="panel-body">
 								<div class="row" id="messagelist">
 									<?php
-									$this->load->view('system/messageList.php', $messages);
+									$this->load->view('system/messages/messageList.php', $messages);
 									?>
 								</div>
 							</div>