diff --git a/resource/web/main_alerts.tmpl b/resource/web/main_alerts.tmpl
index e6fdb466..bf97530d 100755
--- a/resource/web/main_alerts.tmpl
+++ b/resource/web/main_alerts.tmpl
@@ -5,7 +5,8 @@
                 <span aria-hidden="true">&times;</span>
             </button>
             <span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span>
-            <strong>{{.getMessage()}}</strong>
+            <strong>{{.getTitle()}}</strong> &nbsp;
+            {{#.getMessage()}}{{.getMessage()}}{{/.getMessage()}}
         </div>
     {{/.isError()}}
     {{#.isWarning()}}
@@ -14,7 +15,8 @@
                 <span aria-hidden="true">&times;</span>
             </button>
             <span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
-            <strong>{{.getMessage()}}</strong>
+            <strong>{{.getTitle()}}</strong> &nbsp;
+            {{#.getMessage()}}{{.getMessage()}}{{/.getMessage()}}
         </div>
     {{/.isWarning()}}
     {{#.isSuccess()}}
@@ -23,7 +25,8 @@
             <span aria-hidden="true">&times;</span>
         </button>
         <span class="glyphicon glyphicon-ok-circle" aria-hidden="true"></span>
-        <strong>{{.getMessage()}}</strong>
+        <strong>{{.getTitle()}}</strong> &nbsp;
+        {{#.getMessage()}}{{.getMessage()}}{{/.getMessage()}}
     </div>
     {{/.isSuccess()}}
     {{#.isInfo()}}
@@ -32,7 +35,8 @@
                 <span aria-hidden="true">&times;</span>
             </button>
             <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-            <strong>{{.getMessage()}}</strong>
+            <strong>{{.getTitle()}}</strong> &nbsp;
+            {{#.getMessage()}}{{.getMessage()}}{{/.getMessage()}}
         </div>
     {{/.isInfo()}}
 {{/alerts}}
diff --git a/src/se/hal/daemon/SensorDataAggregatorDaemon.java b/src/se/hal/daemon/SensorDataAggregatorDaemon.java
index 5a6eb74e..554df8f1 100755
--- a/src/se/hal/daemon/SensorDataAggregatorDaemon.java
+++ b/src/se/hal/daemon/SensorDataAggregatorDaemon.java
@@ -108,8 +108,9 @@ public class SensorDataAggregatorDaemon implements HalDaemon {
                         maxRawTimestampInDB + (dataInterval * 3) < System.currentTimeMillis()) {
                     logger.fine("Sensor \"" + sensorId + "\" has stopped sending data");
                     HalAlertManager.getInstance().addAlert(new HalAlert(AlertLevel.WARNING,
-                            "Sensor \"" + sensor.getName() + "\" has stopped responding " +
-                                    "since <span class=\"timestamp\">"+maxRawTimestampInDB+"</span>", AlertTTL.DISMISSED));
+                            "Sensor \"" + sensor.getName() + "\" has stopped responding",
+							"since <span class=\"timestamp\">"+maxRawTimestampInDB+"</span>",
+							AlertTTL.DISMISSED));
                 }
             }
 
diff --git a/src/se/hal/page/HalAlertManager.java b/src/se/hal/page/HalAlertManager.java
index 1a2712a6..da8eab32 100755
--- a/src/se/hal/page/HalAlertManager.java
+++ b/src/se/hal/page/HalAlertManager.java
@@ -110,12 +110,18 @@ public class HalAlertManager implements HttpPage {
 
         private int id;
         private AlertLevel level;
+        private String title;
         private String msg;
         private int ttl;
 
-        public HalAlert(AlertLevel level, String msg, AlertTTL ttl) {
+
+        public HalAlert(AlertLevel level, String title, AlertTTL ttl) {
+            this(level, title, null, ttl);
+        }
+        public HalAlert(AlertLevel level, String title, String msg, AlertTTL ttl) {
             this.id = nextId++;
             this.level = level;
+            this.title = title;
             this.msg = msg;
             setTTL(ttl);
         }
@@ -131,6 +137,9 @@ public class HalAlertManager implements HttpPage {
         public boolean isWarning(){ return level == AlertLevel.WARNING; }
         public boolean isSuccess(){ return level == AlertLevel.SUCCESS; }
         public boolean isInfo(){    return level == AlertLevel.INFO; }
+        public String getTitle() {
+            return title;
+        }
         public String getMessage() {
             return msg;
         }
@@ -149,7 +158,7 @@ public class HalAlertManager implements HttpPage {
         public boolean equals(Object obj){
             if (obj instanceof HalAlert)
                 return level == ((HalAlert) obj).level &&
-                        msg.equals(((HalAlert) obj).msg);
+                        title.equals(((HalAlert) obj).title);
             return false;
         }
     }