diff --git a/core/helpers/message.php b/core/helpers/message.php
index ff9e4c82..84c982b1 100644
--- a/core/helpers/message.php
+++ b/core/helpers/message.php
@@ -18,19 +18,35 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class message_Core {
-  public function add($msg) {
+  public function add($msg, $severity=log::INFO) {
     $session = Session::instance();
     $status = $session->get("messages");
-    $status[] = $msg;
+    $status[] = array($msg, $severity);
     $session->set("messages", $status);
   }
 
   public function get() {
     $messages = Session::instance()->get_once("messages", array());
     if ($messages) {
-      return "<ul id=\"gMessages\"><li>" .
-        join("</li><li>", $messages) .
-        "</li>";
+      $buf = "<ul id=\"gMessages\">";
+      foreach ($messages as $msg) {
+        $buf .= "<li class=\"" . self::severity_class($msg[1]) . "\">$msg[0]</li>";
+      }
+      $buf .= "</ul>";
+    }
+    return $buf;
+  }
+
+  public function severity_class($severity) {
+    switch($severity) {
+    case log::INFO:
+      return "gInfo";
+
+    case log::WARNING:
+      return "gWarning";
+
+    case log::ERROR:
+      return "gError";
     }
   }
 }
diff --git a/core/views/admin_block_log_entries.html.php b/core/views/admin_block_log_entries.html.php
index 4ac774d4..7b25d3fc 100644
--- a/core/views/admin_block_log_entries.html.php
+++ b/core/views/admin_block_log_entries.html.php
@@ -1,8 +1,7 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <ul>
-  <? $map = array(log::INFO => "gInfo", log::WARNING => "gWarning", log::ERROR => "gError") ?>
   <? foreach ($entries as $entry): ?>
-  <li class="<?= $map[$entry->severity] ?>">
+  <li class="<?= message::severity_class($entry->severity) ?>">
     <a href="<?= url::site("user/$entry->user_id") ?>"><?= $entry->user->name ?></a>
     <?= date("Y-M-d H:i:s", $entry->timestamp) ?>
     <?= $entry->message ?>