diff --git a/application/config/message.php b/application/config/message.php
index 687922f70..8e7249feb 100644
--- a/application/config/message.php
+++ b/application/config/message.php
@@ -9,6 +9,7 @@ $config['msg_delivery'] = true; // Default true
 $config['system_person_id'] = 1; // Dummy sender, used for sending messages from the system
 $config['redirect_view_message_url'] = 'index.ci.php/Redirect/redirectByToken/'; // 
 $config['message_html_view_url'] = 'index.ci.php/ViewMessage/toHTML/';
+$config['message_server'] = 'http://www.fhcomplete.org/';
 $config['assistent_function'] = 'ass';
 
 define('EMAIL_KONTAKT_TYPE', 'email'); // Email kontakt type
diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index 88c18e8ab..cbcb6863a 100755
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -453,7 +453,7 @@ class MessageLib
 					// If the person has an email account
 					if (!is_null($result->retval[$i]->receiver) && $result->retval[$i]->receiver != '')
 					{
-						$href = APP_ROOT . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
+						$href = $this->ci->config->item('message_server') . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
 						// Using a template for the html email body
 						$body = $this->ci->parser->parse(
 							'templates/mailHTML',
@@ -588,7 +588,7 @@ class MessageLib
 					if ($multiPartMime === true)
 					{
 						// Using a template for the html email body
-						$href = APP_ROOT . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
+						$href = $this->ci->config->item('message_server') . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token;
 						$bodyMsg = $this->ci->parser->parse(
 							'templates/mailHTML',
 							array(