diff --git a/modules/message/message.view.php b/modules/message/message.view.php
index a26537c91..a27a50300 100644
--- a/modules/message/message.view.php
+++ b/modules/message/message.view.php
@@ -21,11 +21,11 @@ class messageView extends message
 	{
 		// Get skin configuration
 		$config = ModuleModel::getModuleConfig('message') ?: new stdClass;
-		if(!$config->skin)
+		if(empty($config->skin))
 		{
 			$config->skin = 'xedition';
 		}
-		if(!$config->mskin)
+		if(empty($config->mskin))
 		{
 			$config->mskin = 'default';
 		}
@@ -64,13 +64,6 @@ class messageView extends message
 		$member_config = ModuleModel::getModuleConfig('member');
 		Context::set('member_config', $member_config);
 		
-		// Set SSL mode (for backward compatibility only)
-		$ssl_mode = false;
-		if($member_config->enable_ssl == 'Y')
-		{
-			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
-		}
-		
 		// Disable location if debug not available
 		if (!Rhymix\Framework\Debug::isEnabledForCurrentUser())
 		{
@@ -83,7 +76,7 @@ class messageView extends message
 			$location = substr($location, strlen(\RX_BASEDIR));
 		}
 
-		Context::set('ssl_mode', $ssl_mode);
+		Context::set('ssl_mode', \RX_SSL);
 		Context::set('system_message', nl2br($this->getMessage()));
 		Context::set('system_message_detail', nl2br($detail));
 		Context::set('system_message_location', escape($location));