diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php
index 0c3e2ac0e..38d71a6d3 100644
--- a/e107_handlers/message_handler.php
+++ b/e107_handlers/message_handler.php
@@ -9,9 +9,9 @@
  * Message Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $
- * $Revision: 1.20 $
- * $Date: 2009-10-21 20:40:28 $
- * $Author: e107coders $
+ * $Revision: 1.21 $
+ * $Date: 2009-10-22 11:18:55 $
+ * $Author: secretr $
  *
 */
 
@@ -331,17 +331,16 @@ class eMessage
 
 		foreach ($this->_get_types() as $type)
 		{
-			$message = $this->get($type, $mstack, $raw);
-			if($type == 'debug' && (E107_DEBUG_LEVEL == 0)) // Quick-fix:  hide debug types when debug mode inactive.
+			if(E_MESSAGE_DEBUG === $type && !deftrue('E107_DEBUG_LEVEL'))
 			{
 				continue;
 			}
+			$message = $this->get($type, $mstack, $raw);
 			
 			if(!empty($message))
 			{
 				$ret[$type] = $message;
-			}		
-			
+			}
 		}
 
 		if($reset) $this->reset(false, $mstack);