diff --git a/html/pages/apps/default.inc.php b/html/pages/apps/default.inc.php
index a09e008e91..0fcba8b239 100644
--- a/html/pages/apps/default.inc.php
+++ b/html/pages/apps/default.inc.php
@@ -19,7 +19,7 @@ $graphs['mysql']  = array('network_traffic', 'connections', 'command_counters',
   foreach ($app_devices as $app_device)
   {
         echo('<tr class="list-device">');
-        echo('<td class="device-head" width=300px>'.generate_device_link($device, shorthost($app_device['hostname']), array('tab'=>'apps','app'=>$vars['app'])).'</td>');
+        echo('<td class="device-head" width=300px>'.generate_device_link($app_device, shorthost($app_device['hostname']), array('tab'=>'apps','app'=>$vars['app'])).'</td>');
         echo('<td class="device-head" width=100px>'.$app_device['app_instance'].'</td>');
         echo('<td class="device-head" width=100px>'.$app_device['app_status'].'</td>');
         echo('<td></td>');
diff --git a/includes/functions.php b/includes/functions.php
index 05928b947a..273337742c 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -533,8 +533,8 @@ function notify($device,$title,$message)
       $emails = parse_email($email);
       if ($emails)
       {
-        $message_header = $config['page_title_prefix'];
-        $message_footer .= "E-mail sent to: ";
+        $message_header = $config['page_title_prefix']."\n";
+        $message_footer = "E-mail sent to: ";
         $i = 0;
         $count = count($emails);
         foreach ($emails as $email => $email_name)