diff --git a/notifications/inc/class.iface_notification.inc.php b/notifications/inc/class.iface_notification.inc.php
index 872bc56706..7f2937cf31 100644
--- a/notifications/inc/class.iface_notification.inc.php
+++ b/notifications/inc/class.iface_notification.inc.php
@@ -6,7 +6,7 @@
  * @package notifications
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id:  $
+ * @version $id$
  */
 
 /**
diff --git a/notifications/inc/class.notification.inc.php b/notifications/inc/class.notification.inc.php
index 47f103d91c..4620634606 100644
--- a/notifications/inc/class.notification.inc.php
+++ b/notifications/inc/class.notification.inc.php
@@ -6,7 +6,7 @@
  * @package notifications
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id:  $
+ * @version $id$
  */
 
 /**
diff --git a/notifications/inc/class.notification_popup.inc.php b/notifications/inc/class.notification_popup.inc.php
index 452ed22db6..b40488c29a 100644
--- a/notifications/inc/class.notification_popup.inc.php
+++ b/notifications/inc/class.notification_popup.inc.php
@@ -7,7 +7,7 @@
  * @subpackage ajaxpopup
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id:  $
+ * @version $id$
  */
 
 require_once('class.iface_notification.inc.php');
@@ -47,14 +47,14 @@ class notification_popup implements iface_notification {
 	/**
 	 * holds preferences object of user to notify
 	 *
-	 * @var unknown_type
+	 * @var object
 	 */
 	private $preferences;
 	
 	/**
 	 * holds db object of SQL database
 	 *
-	 * @var unknown_type
+	 * @var egw_db
 	 */
 	private $db;
 	
diff --git a/notifications/inc/class.uinotificationprefs.inc.php b/notifications/inc/class.uinotificationprefs.inc.php
index b6644a34c7..0e5c2ee0ba 100644
--- a/notifications/inc/class.uinotificationprefs.inc.php
+++ b/notifications/inc/class.uinotificationprefs.inc.php
@@ -6,10 +6,10 @@
  * @package notifications
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id:  $
+ * @version $id$
  */
 
-require_once(EGW_INCLUDE_ROOT. SEP. 'etemplate'. SEP. 'inc'. SEP. 'class.etemplate.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate.inc.php');
 
 class uinotificationprefs {
 	
diff --git a/notifications/inc/hook_after_navbar.inc.php b/notifications/inc/hook_after_navbar.inc.php
index 235e6dfce8..0b60393dce 100644
--- a/notifications/inc/hook_after_navbar.inc.php
+++ b/notifications/inc/hook_after_navbar.inc.php
@@ -10,7 +10,7 @@
  * @subpackage ajaxpoup
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id$
+ * @version $id$
  * @todo check if user wants notifications via egw popup!
  */
 $GLOBALS['egw']->translation->add_app('notifications');
@@ -21,7 +21,7 @@ if (!$GLOBALS['egw_info']['user']['preferences']['notifications']['disable_ajaxp
 		<div id="notificationwindow" style="display: none; z-index: 999;">
 			<div id="divAppboxHeader">'. lang('Notification'). '</div>
 				<div id="divAppbox">
-				<div id="notificationwindow_message"</div>
+				<div id="notificationwindow_message"></div>
 				<center><input type="submit" value="'. lang('ok'). '" onClick="notificationwindow_button_ok();"></center>
 			</div>
 		</div>
diff --git a/notifications/inc/hook_preferences.inc.php b/notifications/inc/hook_preferences.inc.php
index e64766f7c9..b03bd25e16 100644
--- a/notifications/inc/hook_preferences.inc.php
+++ b/notifications/inc/hook_preferences.inc.php
@@ -6,7 +6,7 @@
 	 * @package notifications
 	 * @link http://www.egroupware.org
 	 * @author Cornelius Weiss <nelius@cwtech.de>
-	 * @version $Id:  $
+	 * @version $id$
 	 */
 
 	$title = $appname;
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index c0ba131f4a..a6d9d4dc9e 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -5,7 +5,7 @@
  * @subpackage ajaxpoup
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id:  $
+ * @version $id$
  */
 
 function notificationwindow_init() {
diff --git a/notifications/setup/setup.inc.php b/notifications/setup/setup.inc.php
index 691749099d..c9fcf459ca 100644
--- a/notifications/setup/setup.inc.php
+++ b/notifications/setup/setup.inc.php
@@ -6,7 +6,7 @@
  * @package notifications
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id:  $
+ * @version $id$
  */
 
 if (!defined('NOTIFICATION_APP'))
@@ -15,7 +15,7 @@ if (!defined('NOTIFICATION_APP'))
 }
 
 $setup_info[NOTIFICATION_APP]['name']      = NOTIFICATION_APP;
-$setup_info[NOTIFICATION_APP]['version']   = '0.5';
+$setup_info[NOTIFICATION_APP]['version']   = '0.6';
 $setup_info[NOTIFICATION_APP]['app_order'] = 1;
 $setup_info[NOTIFICATION_APP]['tables']    = array('egw_notificationpopup');
 $setup_info[NOTIFICATION_APP]['enable']    = 2;
@@ -46,3 +46,4 @@ $setup_info[NOTIFICATION_APP]['depends'][] = array(
 	 'appname' => 'etemplate',
 	 'versions' => Array('1.2','1.3')
 );
+
diff --git a/notifications/setup/tables_current.inc.php b/notifications/setup/tables_current.inc.php
index e28faf883e..39ea052c64 100644
--- a/notifications/setup/tables_current.inc.php
+++ b/notifications/setup/tables_current.inc.php
@@ -6,13 +6,13 @@
  * @package notifications
  * @link http://www.egroupware.org
  * @author Cornelius Weiss <nelius@cwtech.de>
- * @version $Id:  $
+ * @version $id$
  */
 
 	$phpgw_baseline = array(
 		'egw_notificationpopup' => array(
 			'fd' => array(
-				'account_id' => array('type' => 'varchar','precision' => '255','nullable' => False),
+				'account_id' => array('type' => 'int','precision' => '20','nullable' => False),
 				'session_id' => array('type' => 'varchar','precision' => '255','nullable' => False),
 				'message' => array('type' => 'longtext')
 			),