diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index aa63095c9..fdf1632d6 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1524,7 +1524,6 @@ class Context
 		if ($status != 200)
 		{
 			$oMessageObject->setHttpStatusCode($status);
-			ModuleHandler::_setHttpStatusMessage($status);
 		}
 		
 		if (in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON', 'JS_CALLBACK')))
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 0afb24ab0..d8581b0dc 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -919,8 +919,6 @@ class ModuleHandler extends Handler
 					$oMessageObject->setTemplateFile('http_status_code');
 				}
 				
-				self::_setHttpStatusMessage($oMessageObject->getHttpStatusCode());
-				
 				// If module was called normally, change the templates of the module into ones of the message view module
 				if($oModule)
 				{
@@ -933,7 +931,7 @@ class ModuleHandler extends Handler
 				{
 					$oModule = $oMessageObject;
 				}
-
+				
 				self::_clearErrorSession();
 			}
 
@@ -1051,7 +1049,10 @@ class ModuleHandler extends Handler
 				}
 			}
 		}
-
+		
+		// Set http status message
+		self::_setHttpStatusMessage($oModule->getHttpStatusCode());
+		
 		// Display contents
 		$oDisplayHandler = new DisplayHandler();
 		$oDisplayHandler->printContent($oModule);
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 7122bab11..08cefd9f9 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -237,8 +237,7 @@ class ModuleObject extends Object
 		$this->setTemplatePath($oMessageObject->getTemplatePath());
 		$this->setTemplateFile($oMessageObject->getTemplateFile());
 		$this->setHttpStatusCode($oMessageObject->getHttpStatusCode());
-		ModuleHandler::_setHttpStatusMessage($oMessageObject->getHttpStatusCode());
-
+		
 		return $this;
 	}