diff --git a/addressbook/doc/fieldnames.txt b/addressbook/doc/fieldnames.txt
new file mode 100644
index 0000000000..88b5ba8fe6
--- /dev/null
+++ b/addressbook/doc/fieldnames.txt
@@ -0,0 +1,60 @@
+This are the internal fieldnames and their meaning of the 1.4 addressbook:
+-------------------------------------------------------------------------
+id                   => Contact ID
+tid                  => Typ
+owner                => Addressbook
+private              => private
+cat_id               => Category
+n_prefix             => prefix
+n_given              => first name
+n_middle             => middle name
+n_family             => last name
+n_suffix             => suffix
+n_fn                 => full name
+n_fileas             => own sorting
+bday                 => birthday
+org_name             => Company
+org_unit             => Department
+title                => Title
+role                 => Role
+assistent            => Assistent
+room                 => Room
+adr_one_street       => street business
+adr_one_street2      => address line 2 business
+adr_one_locality     => city business
+adr_one_region       => state business
+adr_one_postalcode   => zip code business
+adr_one_countryname  => country business
+label                => label
+adr_two_street       => street private
+adr_two_street2      => address line 2 private
+adr_two_locality     => city private
+adr_two_region       => state private
+adr_two_postalcode   => zip code private
+adr_two_countryname  => country private
+tel_work             => work phone
+tel_cell             => mobile phone
+tel_fax              => fax business
+tel_assistent        => assistent phone
+tel_car              => car phone
+tel_pager            => pager
+tel_home             => home phone
+tel_fax_home         => fax private
+tel_cell_private     => mobile phone private
+tel_other            => other phone
+tel_prefer           => preferred phone
+email                => email business
+email_home           => email private
+url                  => url business
+url_home             => url private
+freebusy_uri         => Freebusy URI
+calendar_uri         => Calendar URI
+note                 => note
+tz                   => time zone
+geo                  => geo
+pubkey               => public key
+created              => created
+creator              => created by
+modified             => last modified
+modifier             => last modified by
+jpegphoto            => photo
diff --git a/admin/admin-cli.php b/admin/admin-cli.php
index c79ca85153..f37996a296 100755
--- a/admin/admin-cli.php
+++ b/admin/admin-cli.php
@@ -51,6 +51,9 @@ switch($action)
 		
 	case '--change-account-id':
 		return do_change_account_id($arg0s);
+		
+	case '--check-acl';
+		return do_check_acl();
 
 	default:
 		usage($action);
@@ -100,9 +103,28 @@ function usage($action=null,$ret=0)
 	echo "	Deletes a user from eGroupWare. It's data can be moved to an other user or it get deleted too.\n";
 	echo "--change-account-id admin-account[@domain],admin-password,from1,to1[...,fromN,toN]\n";
 	echo "	Changes one or more account_id's in the database (make a backup before!).\n";
+	echo "--check-acl admin-account[@domain],admin-password\n";
+	echo "	Deletes ACL entries of not longer existing accounts (make a database backup before!).\n";
 	exit;	
 }
 
+function do_check_acl()
+{
+	$deleted = 0;
+	if (($all_accounts = $GLOBALS['egw']->accounts->search(array('type'=>'both'))))
+	{
+		$ids = array();
+		foreach($all_accounts as $account)
+		{
+			$ids[] = $account['account_id'];
+		}
+		// does not work for LDAP! $ids = array_keys($all_accounts);
+		$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',',$ids).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','",$ids)."')",__LINE__,__FILE__);
+		$deleted = $GLOBALS['egw']->db->affected_rows();
+	}
+	echo "\n$deleted ACL records of not (longer) existing accounts deleted.\n\n";
+}
+
 /**
  * Delete a given user from eGW
  *
diff --git a/admin/check_acl.php b/admin/check_acl.php
deleted file mode 100644
index c487180e1c..0000000000
--- a/admin/check_acl.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**************************************************************************\
-* eGroupWare - Admin - delete ACL records of deleted accounts              *
-* http://www.egroupware.org                                                *
-* Written and (c) 2004 by Ralf Becker <RalfBecker@outdoor-training.de>     *
-* --------------------------------------------                             *
-*  This program is free software; you can redistribute it and/or modify it *
-*  under the terms of the GNU General Public License as published by the   *
-*  Free Software Foundation; either version 2 of the License, or (at your  *
-*  option) any later version.                                              *
-\**************************************************************************/
-
-/* $Id$ */
-
-/**
- * delete ACL records of deleted accounts (can be called only via the URL)
- *
- * ACL records of deleted accounts have very irritating effects on the ACL (specialy calendar)
- *
- * @package admin
- * @author RalfBecker@outdoor-training.de
- * @license GPL
- */
-
-$GLOBALS['egw_info'] = array(
-	'flags' => array(
-		'currentapp' => 'admin',
-));
-include('../header.inc.php');
-
-if (!$GLOBALS['egw_info']['user']['apps']['admin'])
-{
-	echo '<p align="center">'.lang('Permission denied')."</p>\n";
-}
-else
-{
-	$deleted = 0;
-	if (($all_accounts = $GLOBALS['egw']->accounts->search(array('type'=>'both'))))
-	{
-		$all_accounts = array_keys($all_accounts);
-		$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',',$all_accounts).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','",$all_accounts)."')",__LINE__,__FILE__);
-		$deleted = $GLOBALS['egw']->db->affected_rows();
-	}
-	echo '<p align="center">'.lang('%1 ACL records of not (longer) existing accounts deleted.',$deleted)."</p>\n";
-}
-$GLOBALS['egw']->common->egw_footer();
-$GLOBALS['egw']->common->egw_exit();
diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php
index 83ac1078ef..d04b49b5c3 100644
--- a/etemplate/inc/class.uietemplate.inc.php
+++ b/etemplate/inc/class.uietemplate.inc.php
@@ -281,7 +281,7 @@
 						}
 						else
 						{
-							echo '<div id="divMain">'."\n";
+							echo '<div id="popupMainDiv">'."\n";
 							if ($GLOBALS['egw_info']['user']['apps']['manual'])	// adding a manual icon to every popup
 							{
 								$manual =& new etemplate('etemplate.popup.manual');
diff --git a/felamimail/setup/phpgw_de.lang b/felamimail/setup/phpgw_de.lang
index dcd67f9402..7c4c464199 100644
--- a/felamimail/setup/phpgw_de.lang
+++ b/felamimail/setup/phpgw_de.lang
@@ -145,7 +145,7 @@ file into	felamimail	de	verschiebe nach
 files	felamimail	de	Dateien
 filter active	felamimail	de	Filter aktiv
 filter name	felamimail	de	Filtername
-filter rules	preferences	de	Filter Regeln
+filter rules	common	de	Filter Regeln
 first name	felamimail	de	Vorname
 flagged	felamimail	de	wichtig
 flags	felamimail	de	Markierungen
@@ -224,7 +224,7 @@ location of buttons when composing	felamimail	de	Ort der Kn
 mail server login type	admin	de	Typ der Mailserver Anmeldung
 mail settings	felamimail	de	E-Mail-Einstellungen
 mainmessage	felamimail	de	Hauptnachricht
-manage emailaccounts	felamimail	de	E-Mail-Konten verwalten
+manage emailaccounts	preferences	de	E-Mail-Konten verwalten
 manage emailfilter / vacation	preferences	de	Verwalten der E-Mail-Filter und Abwesenheitsnotiz
 manage folders	common	de	Ordner verwalten
 manage sieve	common	de	Sieve Scripte verwalten
@@ -403,7 +403,7 @@ use custom settings	felamimail	de	benutze angepa
 use regular expressions	felamimail	de	reguläre Ausdrücke verwenden
 use smtp auth	admin	de	SMTP Auth benutzen
 users can define their own emailaccounts	admin	de	Anwender können ihre eigenen Konten definieren
-vacation notice	preferences	de	Abwesenheitsnotiz
+vacation notice	common	de	Abwesenheitsnotiz
 vacation notice is active	felamimail	de	Abwesenheitsnotiz ist aktiv
 validate certificate	felamimail	de	Zertifikat überprüfen
 view full header	felamimail	de	alle Kopfzeilen anzeigen
diff --git a/felamimail/setup/phpgw_en.lang b/felamimail/setup/phpgw_en.lang
index ea51d86548..95d5fb4258 100644
--- a/felamimail/setup/phpgw_en.lang
+++ b/felamimail/setup/phpgw_en.lang
@@ -145,7 +145,7 @@ file into	felamimail	en	file into
 files	felamimail	en	files
 filter active	felamimail	en	filter active
 filter name	felamimail	en	Filter name
-filter rules	preferences	en	filter rules
+filter rules	common	en	filter rules
 first name	felamimail	en	First name
 flagged	felamimail	en	flagged
 flags	felamimail	en	Flags
@@ -403,7 +403,7 @@ use custom settings	felamimail	en	Use Custom Settings
 use regular expressions	felamimail	en	use regular expressions
 use smtp auth	admin	en	Use SMTP auth
 users can define their own emailaccounts	admin	en	Users can define their own emailaccounts
-vacation notice	preferences	en	vacation notice
+vacation notice	common	en	vacation notice
 vacation notice is active	felamimail	en	Vacation notice is active
 validate certificate	felamimail	en	validate certificate
 view full header	felamimail	en	View full header
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index ca3696fd8d..414b9d7228 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -621,6 +621,7 @@ class html
 		switch($_mode) {
 			case 'simple':
 				$oFCKeditor->ToolbarSet = 'egw_simple';
+				$oFCKeditor->Config['ContextMenu'] = false;
 				break;
 
 			default:
@@ -661,6 +662,7 @@ class html
 				return "<textarea name=\"$_name\" style=\"width:100%; height:400px; border:0px;\">$_content</textarea>";
 				break;
 			case 'simple':
+				$oFCKeditor->Config['ContextMenu'] = false;
 				$oFCKeditor->ToolbarSet = 'egw_simple';
 				return $oFCKeditor->CreateHTML() ;
 				break;
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
index 3073882adc..2fb6f6ce0e 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
@@ -227,7 +227,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
 			return FALSE;
 		}
                 
-                if(strstr($this->_locName,'@') === False)
+                if(strpos($this->_locName,'@') === False)
                 {
                 	$this->_locName .= '@'.$GLOBALS['egw_info']['server']['default_domain'];
                 }
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js
index 0a35d68e67..20030fd12c 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck_gecko.js
@@ -60,8 +60,10 @@ FCK.InitializeBehaviors = function()
 	this.EditorDocument.addEventListener( 'dblclick', this._DblClickListener, true ) ;
 
 	// Reset the context menu.
-	FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow( FCK.EditorWindow ) ;
-	FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument ) ;
+	if ( FCKConfig.ContextMenu != null ) {
+		FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow( FCK.EditorWindow ) ;
+		FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument ) ;
+	}
 }
 
 FCK.MakeEditable = function()
diff --git a/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js b/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js
index a6df4b4f44..4aabce8799 100644
--- a/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js
+++ b/phpgwapi/js/fckeditor/editor/_source/internals/fck_ie.js
@@ -127,7 +127,8 @@ FCK.InitializeBehaviors = function( dontReturn )
 	this.EditorDocument.body.attachEvent( 'onpaste', Doc_OnPaste ) ;
 
 	// Reset the context menu.
-	FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument.body ) ;
+	if ( FCKConfig.ContextMenu != null )
+		FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument.body ) ;
 
 	// Build the "TAB" key replacement (if necessary).
 	if ( FCKConfig.TabSpaces > 0 )
diff --git a/phpgwapi/js/fckeditor/editor/fckeditor.html b/phpgwapi/js/fckeditor/editor/fckeditor.html
index 92beaf4d20..5abcf31a57 100644
--- a/phpgwapi/js/fckeditor/editor/fckeditor.html
+++ b/phpgwapi/js/fckeditor/editor/fckeditor.html
@@ -101,7 +101,8 @@ LoadScript( 'lang/' + FCKLanguageManager.ActiveLanguage.Code + '.js' ) ;
 	<script type="text/javascript">
 
 // Initialize the editing area context menu.
-FCK_ContextMenu_Init() ;
+if ( FCKConfig.ContextMenu != null )
+  FCK_ContextMenu_Init() ;
 
 FCKPlugins.Load() ;
 
diff --git a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js
index 51f77abb3d..474639dfcd 100644
--- a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js
+++ b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_gecko.js
@@ -28,7 +28,7 @@ var s=navigator.userAgent.toLowerCase();var FCKBrowserInfo={IsIE:s.Contains('msi
 var FCKURLParams={};(function(){var A=document.location.search.substr(1).split('&');for (var i=0;i<A.length;i++){var B=A[i].split('=');var C=decodeURIComponent(B[0]);var D=decodeURIComponent(B[1]);FCKURLParams[C]=D;}})();
 var FCKEvents=function(A){this.Owner=A;this._RegisteredEvents={};};FCKEvents.prototype.AttachEvent=function(A,B){var C;if (!(C=this._RegisteredEvents[A])) this._RegisteredEvents[A]=[B];else C.push(B);};FCKEvents.prototype.FireEvent=function(A,B){var C=true;var D=this._RegisteredEvents[A];if (D){for (var i=0;i<D.length;i++) C=(D[i](this.Owner,B)&&C);};return C;};
 var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else return (this.StartupValue!=this.EditorDocument.body.innerHTML);},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86/*V*/) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45/*INS*/) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=false;FCKListsLib.Setup();this.SetHTML(this.GetLinkedFieldValue(),true);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:if (!FCKListsLib.BlockElements[D.nodeName.toLowerCase()]) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;};if (F){var G=D.parentNode;if (!E) E=G.insertBefore(B.createElement(A),D);E.appendChild(G.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetXHTML:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B;var C=FCK.EditorDocument;if (!C) return null;if (FCKConfig.FullPage){B=FCKXHtml.GetXHTML(C.getElementsByTagName('html')[0],true,A);if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) B=FCK.DocTypeDeclaration+'\n'+B;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) B=FCK.XmlDeclaration+'\n'+B;}else{B=FCKXHtml.GetXHTML(C.body,false,A);if (FCKConfig.IgnoreEmptyParagraphValue&&FCKRegexLib.EmptyOutParagraph.test(B)) B='';};B=FCK.ProtectEventsRestore(B);if (FCKBrowserInfo.IsIE) B=B.replace(FCKRegexLib.ToReplace,'$1');return FCKConfig.ProtectedSource.Revert(B);},UpdateLinkedField:function(){FCK.LinkedField.value=FCK.GetXHTML(FCKConfig.FormatOutput);FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName];if (B) B(A);},RegisterDoubleClickHandler:function(A,B){FCK.RegisteredDoubleClickHandlers[B.toUpperCase()]=A;},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR':'ABBR';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\s|>)[\s\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetHTML:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCK.EditMode==0){A=FCKConfig.ProtectedSource.Protect(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCKBrowserInfo.IsGecko){A=A.replace(FCKRegexLib.StrongOpener,'<b$1');A=A.replace(FCKRegexLib.StrongCloser,'<\/b>');A=A.replace(FCKRegexLib.EmOpener,'<i$1');A=A.replace(FCKRegexLib.EmCloser,'<\/i>');};this._ForceResetIsDirty=(B===true);var C='';if (FCKConfig.FullPage){if (!FCKRegexLib.HeadOpener.test(A)){if (!FCKRegexLib.HtmlOpener.test(A)) A='<html dir="'+FCKConfig.ContentLangDirection+'">'+A+'</html>';A=A.replace(FCKRegexLib.HtmlOpener,'$&<head></head>');};FCK.DocTypeDeclaration=A.match(FCKRegexLib.DocTypeTag);if (FCKBrowserInfo.IsIE) C=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C='<link href="'+FCKConfig.FullBasePath+'css/fck_showtableborders_gecko.css" rel="stylesheet" type="text/css" _fcktemp="true" />';C+='<link href="'+FCKConfig.FullBasePath+'css/fck_internal.css" rel="stylesheet" type="text/css" _fcktemp="true" />';C=A.replace(FCKRegexLib.HeadCloser,C+'$&');if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) C=C.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);}else{C=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"';if (FCKBrowserInfo.IsIE&&!FCKRegexLib.Html4DocType.test(FCKConfig.DocType)) C+=' style="overflow-y: scroll"';C+='><head><title></title>'+_FCK_GetEditorAreaStyleTags()+'<link href="'+FCKConfig.FullBasePath+'css/fck_internal.css" rel="stylesheet" type="text/css" _fcktemp="true" />';if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+='<link href="'+FCKConfig.FullBasePath+'css/fck_showtableborders_gecko.css" rel="stylesheet" type="text/css" _fcktemp="true" />';C+=FCK.TempBaseTag;var D='<body';if (FCKConfig.BodyId&&FCKConfig.BodyId.length>0) D+=' id="'+FCKConfig.BodyId+'"';if (FCKConfig.BodyClass&&FCKConfig.BodyClass.length>0) D+=' class="'+FCKConfig.BodyClass+'"';C+='</head>'+D+'>';if (FCKBrowserInfo.IsGecko&&(A.length==0||FCKRegexLib.EmptyParagraph.test(A))) C+=GECKO_BOGUS;else C+=A;C+='</body></html>';};this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(C);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},HasFocus:false,RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C){FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else return FCK.EditorDocument.queryCommandState(A)?1:0;}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A=FCKConfig.ScreenWidth*0.8;var B=FCKConfig.ScreenHeight*0.7;var C=(FCKConfig.ScreenWidth-A)/2;var D=window.open('',null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+A+',height='+B+',left='+C);var E;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) E=FCK.TempBaseTag+FCK.GetXHTML();else E=FCK.GetXHTML();}else{E=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body>'+FCK.GetXHTML()+'</body></html>';};D.document.write(E);D.document.close();},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetHTML(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},CreateElement:function(A){var e=FCK.EditorDocument.createElement(A);return FCK.InsertElementAndGetIt(e);},InsertElementAndGetIt:function(e){e.setAttribute('FCKTempLabel','true');this.InsertElement(e);var A=FCK.EditorDocument.getElementsByTagName(e.tagName);for (var i=0;i<A.length;i++){if (A[i].getAttribute('FCKTempLabel')){A[i].removeAttribute('FCKTempLabel');return A[i];}};return null;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+A.ReplaceAll([/&/g,/'/g,/"/g,/=/g,/</g,/>/g,/\r/g,/\n/g],['&apos;','&#39;','&quot;','&#61;','&lt;','&gt;','&#10;','&#13;'])+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return B.ReplaceAll([/&#39;/g,/&quot;/g,/&#61;/g,/&lt;/g,/&gt;/g,/&#10;/g,/&#13;/g,/&apos;/g],["'",'"','=','<','>','\r','\n','&']);};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;FCK.InitializeBehaviors();if (!FCKConfig.DisableEnterKeyHandler) FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){var A='';var B=FCKConfig.EditorAreaCSS;for (var i=0;i<B.length;i++) A+='<link href="'+B[i]+'" rel="stylesheet" type="text/css" />';return A;};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){if (B=='Paste') return!FCK.Events.FireEvent('OnPaste');}else{if (B.Equals('Paste','Undo','Redo','SelectAll')) return false;};var C=FCK.Commands.GetCommand(B);return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]==null;this.Elements.length=0;}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){FCK.Focus();FCKFocusManager_Win_OnFocus();};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};
-FCK.Description="FCKeditor for Gecko Browsers";FCK.InitializeBehaviors=function(){if (FCKBrowserInfo.IsGecko) Window_OnResize();FCKFocusManager.AddWindow(this.EditorWindow);this.ExecOnSelectionChange=function(){FCK.Events.FireEvent("OnSelectionChange");};this.ExecOnSelectionChangeTimer=function(){if (FCK.LastOnChangeTimer) window.clearTimeout(FCK.LastOnChangeTimer);FCK.LastOnChangeTimer=window.setTimeout(FCK.ExecOnSelectionChange,100);};this.EditorDocument.addEventListener('mouseup',this.ExecOnSelectionChange,false);this.EditorDocument.addEventListener('keyup',this.ExecOnSelectionChangeTimer,false);this._DblClickListener=function(e){FCK.OnDoubleClick(e.target);e.stopPropagation();};this.EditorDocument.addEventListener('dblclick',this._DblClickListener,true);FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow(FCK.EditorWindow);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument);};FCK.MakeEditable=function(){this.EditingArea.MakeEditable();};function Document_OnContextMenu(e){if (!e.target._FCKShowContextMenu) e.preventDefault();};document.oncontextmenu=Document_OnContextMenu;FCK._BaseGetNamedCommandState=FCK.GetNamedCommandState;FCK.GetNamedCommandState=function(A){switch (A){case 'Unlink':return FCKSelection.HasAncestorNode('A')?0:-1;default:return FCK._BaseGetNamedCommandState(A);}};FCK.RedirectNamedCommands={Print:true,Paste:true,Cut:true,Copy:true};FCK.ExecuteRedirectedNamedCommand=function(A,B){switch (A){case 'Print':FCK.EditorWindow.print();break;case 'Paste':try			{ if (FCK.Paste()) FCK.ExecuteNamedCommand('Paste',null,true);}catch (e)	{ FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security');};break;case 'Cut':try			{ FCK.ExecuteNamedCommand('Cut',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCut);};break;case 'Copy':try			{ FCK.ExecuteNamedCommand('Copy',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCopy);};break;default:FCK.ExecuteNamedCommand(A,B);}};FCK.AttachToOnSelectionChange=function(A){this.Events.AttachEvent('OnSelectionChange',A);};FCK.Paste=function(){if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};return true;};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);A=A.replace(FCKRegexLib.StrongOpener,'<b$1');A=A.replace(FCKRegexLib.StrongCloser,'<\/b>');A=A.replace(FCKRegexLib.EmOpener,'<i$1');A=A.replace(FCKRegexLib.EmCloser,'<\/i>');var B=FCKSelection.Delete();var C=B.getRangeAt(0);var D=C.createContextualFragment(A);var E=D.lastChild;C.insertNode(D);FCKSelection.SelectNode(E);FCKSelection.Collapse(false);this.Focus();};FCK.InsertElement=function(A){var B=FCKSelection.Delete();var C=B.getRangeAt(0);C.insertNode(A);FCKSelection.SelectNode(A);FCKSelection.Collapse(false);this.Focus();};FCK.PasteAsPlainText=function(){FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText']);};FCK.GetClipboardHTML=function(){return '';};FCK.CreateLink=function(A){FCK.ExecuteNamedCommand('Unlink');if (A.length>0){var B='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',B);var C=this.EditorDocument.evaluate("//a[@href='"+B+"']",this.EditorDocument.body,null,XPathResult.FIRST_ORDERED_NODE_TYPE,null).singleNodeValue;if (C){C.href=A;return C;}};return null;};
+FCK.Description="FCKeditor for Gecko Browsers";FCK.InitializeBehaviors=function(){if (FCKBrowserInfo.IsGecko) Window_OnResize();FCKFocusManager.AddWindow(this.EditorWindow);this.ExecOnSelectionChange=function(){FCK.Events.FireEvent("OnSelectionChange");};this.ExecOnSelectionChangeTimer=function(){if (FCK.LastOnChangeTimer) window.clearTimeout(FCK.LastOnChangeTimer);FCK.LastOnChangeTimer=window.setTimeout(FCK.ExecOnSelectionChange,100);};this.EditorDocument.addEventListener('mouseup',this.ExecOnSelectionChange,false);this.EditorDocument.addEventListener('keyup',this.ExecOnSelectionChangeTimer,false);this._DblClickListener=function(e){FCK.OnDoubleClick(e.target);e.stopPropagation();};this.EditorDocument.addEventListener('dblclick',this._DblClickListener,true);if (FCKConfig.ContextMenu!=null){FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow(FCK.EditorWindow);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument);};};FCK.MakeEditable=function(){this.EditingArea.MakeEditable();};function Document_OnContextMenu(e){if (!e.target._FCKShowContextMenu) e.preventDefault();};document.oncontextmenu=Document_OnContextMenu;FCK._BaseGetNamedCommandState=FCK.GetNamedCommandState;FCK.GetNamedCommandState=function(A){switch (A){case 'Unlink':return FCKSelection.HasAncestorNode('A')?0:-1;default:return FCK._BaseGetNamedCommandState(A);}};FCK.RedirectNamedCommands={Print:true,Paste:true,Cut:true,Copy:true};FCK.ExecuteRedirectedNamedCommand=function(A,B){switch (A){case 'Print':FCK.EditorWindow.print();break;case 'Paste':try			{ if (FCK.Paste()) FCK.ExecuteNamedCommand('Paste',null,true);}catch (e)	{ FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security');};break;case 'Cut':try			{ FCK.ExecuteNamedCommand('Cut',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCut);};break;case 'Copy':try			{ FCK.ExecuteNamedCommand('Copy',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCopy);};break;default:FCK.ExecuteNamedCommand(A,B);}};FCK.AttachToOnSelectionChange=function(A){this.Events.AttachEvent('OnSelectionChange',A);};FCK.Paste=function(){if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};return true;};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);A=A.replace(FCKRegexLib.StrongOpener,'<b$1');A=A.replace(FCKRegexLib.StrongCloser,'<\/b>');A=A.replace(FCKRegexLib.EmOpener,'<i$1');A=A.replace(FCKRegexLib.EmCloser,'<\/i>');var B=FCKSelection.Delete();var C=B.getRangeAt(0);var D=C.createContextualFragment(A);var E=D.lastChild;C.insertNode(D);FCKSelection.SelectNode(E);FCKSelection.Collapse(false);this.Focus();};FCK.InsertElement=function(A){var B=FCKSelection.Delete();var C=B.getRangeAt(0);C.insertNode(A);FCKSelection.SelectNode(A);FCKSelection.Collapse(false);this.Focus();};FCK.PasteAsPlainText=function(){FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText']);};FCK.GetClipboardHTML=function(){return '';};FCK.CreateLink=function(A){FCK.ExecuteNamedCommand('Unlink');if (A.length>0){var B='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',B);var C=this.EditorDocument.evaluate("//a[@href='"+B+"']",this.EditorDocument.body,null,XPathResult.FIRST_ORDERED_NODE_TYPE,null).singleNodeValue;if (C){C.href=A;return C;}};return null;};
 var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi, '/');FCKConfig.BasePath='file://'+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;}else{FCKConfig.BasePath=document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=document.location.protocol+'//'+document.location.host+FCKConfig.BasePath;};FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {/*Ignore it. Much probably we are inside a FRAME where the "top" is in another domain (security error).*/}};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';if (typeof(A.EditorAreaCSS)=='string') A.EditorAreaCSS=[A.EditorAreaCSS];var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;else if (typeof(B)=='string') A.ToolbarComboPreviewCSS=[B];};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.AddItem([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.AddItem(A);};FCKConfig.ProtectedSource.Protect=function(A){function _Replace(protectedSource){var B=FCKTempBin.AddElement(protectedSource);return '<!--{PS..'+B+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};return A.replace(/(<|&lt;)!--\{PS..(\d+)\}--(>|&gt;)/g,_Replace);}
 var FCKDebug={};FCKDebug._GetWindow=function(){if (!this.DebugWindow||this.DebugWindow.closed) this.DebugWindow=window.open(FCKConfig.BasePath+'fckdebug.html','FCKeditorDebug','menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500',true);return this.DebugWindow;};FCKDebug.Output=function(A,B,C){if (!FCKConfig.Debug) return;try{this._GetWindow().Output(A,B);}catch (e) {}};FCKDebug.OutputObject=function(A,B){if (!FCKConfig.Debug) return;try{this._GetWindow().OutputObject(A,B);}catch (e) {}}
 var FCKDomTools={MoveChildren:function(A,B){if (A==B) return;var C;while ((C=A.firstChild)) B.appendChild(A.removeChild(C));},TrimNode:function(A,B){this.LTrimNode(A);this.RTrimNode(A,B);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A,B){var C;while ((C=A.lastChild)){switch (C.nodeType){case 1:if (C.nodeName.toUpperCase()=='BR'&&(B||C.getAttribute('type',2)=='_moz')){A.removeChild(C);continue;};break;case 3:var D=C.nodeValue.RTrim();var E=C.nodeValue.length;if (D.length==0){C.parentNode.removeChild(C);continue;}else if (D.length<E){C.splitText(D.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D){if (!A) return null;if (A.nextSibling) A=A.nextSibling;else return this.GetNextSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.firstChild) A=A.firstChild;else return this.GetNextSourceElement(A,B,C,D);};return null;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.splice(0,0,A);A=A.parentNode;};return B;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;}};
diff --git a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js
index c2d655c486..fda29d023a 100644
--- a/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js
+++ b/phpgwapi/js/fckeditor/editor/js/fckeditorcode_ie.js
@@ -29,7 +29,7 @@ var s=navigator.userAgent.toLowerCase();var FCKBrowserInfo={IsIE:s.Contains('msi
 var FCKURLParams={};(function(){var A=document.location.search.substr(1).split('&');for (var i=0;i<A.length;i++){var B=A[i].split('=');var C=decodeURIComponent(B[0]);var D=decodeURIComponent(B[1]);FCKURLParams[C]=D;}})();
 var FCKEvents=function(A){this.Owner=A;this._RegisteredEvents={};};FCKEvents.prototype.AttachEvent=function(A,B){var C;if (!(C=this._RegisteredEvents[A])) this._RegisteredEvents[A]=[B];else C.push(B);};FCKEvents.prototype.FireEvent=function(A,B){var C=true;var D=this._RegisteredEvents[A];if (D){for (var i=0;i<D.length;i++) C=(D[i](this.Owner,B)&&C);};return C;};
 var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else return (this.StartupValue!=this.EditorDocument.body.innerHTML);},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86/*V*/) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45/*INS*/) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=false;FCKListsLib.Setup();this.SetHTML(this.GetLinkedFieldValue(),true);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:if (!FCKListsLib.BlockElements[D.nodeName.toLowerCase()]) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;};if (F){var G=D.parentNode;if (!E) E=G.insertBefore(B.createElement(A),D);E.appendChild(G.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetXHTML:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B;var C=FCK.EditorDocument;if (!C) return null;if (FCKConfig.FullPage){B=FCKXHtml.GetXHTML(C.getElementsByTagName('html')[0],true,A);if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) B=FCK.DocTypeDeclaration+'\n'+B;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) B=FCK.XmlDeclaration+'\n'+B;}else{B=FCKXHtml.GetXHTML(C.body,false,A);if (FCKConfig.IgnoreEmptyParagraphValue&&FCKRegexLib.EmptyOutParagraph.test(B)) B='';};B=FCK.ProtectEventsRestore(B);if (FCKBrowserInfo.IsIE) B=B.replace(FCKRegexLib.ToReplace,'$1');return FCKConfig.ProtectedSource.Revert(B);},UpdateLinkedField:function(){FCK.LinkedField.value=FCK.GetXHTML(FCKConfig.FormatOutput);FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName];if (B) B(A);},RegisterDoubleClickHandler:function(A,B){FCK.RegisteredDoubleClickHandlers[B.toUpperCase()]=A;},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR':'ABBR';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\s|>)[\s\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetHTML:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCK.EditMode==0){A=FCKConfig.ProtectedSource.Protect(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCKBrowserInfo.IsGecko){A=A.replace(FCKRegexLib.StrongOpener,'<b$1');A=A.replace(FCKRegexLib.StrongCloser,'<\/b>');A=A.replace(FCKRegexLib.EmOpener,'<i$1');A=A.replace(FCKRegexLib.EmCloser,'<\/i>');};this._ForceResetIsDirty=(B===true);var C='';if (FCKConfig.FullPage){if (!FCKRegexLib.HeadOpener.test(A)){if (!FCKRegexLib.HtmlOpener.test(A)) A='<html dir="'+FCKConfig.ContentLangDirection+'">'+A+'</html>';A=A.replace(FCKRegexLib.HtmlOpener,'$&<head></head>');};FCK.DocTypeDeclaration=A.match(FCKRegexLib.DocTypeTag);if (FCKBrowserInfo.IsIE) C=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C='<link href="'+FCKConfig.FullBasePath+'css/fck_showtableborders_gecko.css" rel="stylesheet" type="text/css" _fcktemp="true" />';C+='<link href="'+FCKConfig.FullBasePath+'css/fck_internal.css" rel="stylesheet" type="text/css" _fcktemp="true" />';C=A.replace(FCKRegexLib.HeadCloser,C+'$&');if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) C=C.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);}else{C=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"';if (FCKBrowserInfo.IsIE&&!FCKRegexLib.Html4DocType.test(FCKConfig.DocType)) C+=' style="overflow-y: scroll"';C+='><head><title></title>'+_FCK_GetEditorAreaStyleTags()+'<link href="'+FCKConfig.FullBasePath+'css/fck_internal.css" rel="stylesheet" type="text/css" _fcktemp="true" />';if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+='<link href="'+FCKConfig.FullBasePath+'css/fck_showtableborders_gecko.css" rel="stylesheet" type="text/css" _fcktemp="true" />';C+=FCK.TempBaseTag;var D='<body';if (FCKConfig.BodyId&&FCKConfig.BodyId.length>0) D+=' id="'+FCKConfig.BodyId+'"';if (FCKConfig.BodyClass&&FCKConfig.BodyClass.length>0) D+=' class="'+FCKConfig.BodyClass+'"';C+='</head>'+D+'>';if (FCKBrowserInfo.IsGecko&&(A.length==0||FCKRegexLib.EmptyParagraph.test(A))) C+=GECKO_BOGUS;else C+=A;C+='</body></html>';};this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(C);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},HasFocus:false,RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C){FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else return FCK.EditorDocument.queryCommandState(A)?1:0;}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A=FCKConfig.ScreenWidth*0.8;var B=FCKConfig.ScreenHeight*0.7;var C=(FCKConfig.ScreenWidth-A)/2;var D=window.open('',null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+A+',height='+B+',left='+C);var E;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) E=FCK.TempBaseTag+FCK.GetXHTML();else E=FCK.GetXHTML();}else{E=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body>'+FCK.GetXHTML()+'</body></html>';};D.document.write(E);D.document.close();},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetHTML(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},CreateElement:function(A){var e=FCK.EditorDocument.createElement(A);return FCK.InsertElementAndGetIt(e);},InsertElementAndGetIt:function(e){e.setAttribute('FCKTempLabel','true');this.InsertElement(e);var A=FCK.EditorDocument.getElementsByTagName(e.tagName);for (var i=0;i<A.length;i++){if (A[i].getAttribute('FCKTempLabel')){A[i].removeAttribute('FCKTempLabel');return A[i];}};return null;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+A.ReplaceAll([/&/g,/'/g,/"/g,/=/g,/</g,/>/g,/\r/g,/\n/g],['&apos;','&#39;','&quot;','&#61;','&lt;','&gt;','&#10;','&#13;'])+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return B.ReplaceAll([/&#39;/g,/&quot;/g,/&#61;/g,/&lt;/g,/&gt;/g,/&#10;/g,/&#13;/g,/&apos;/g],["'",'"','=','<','>','\r','\n','&']);};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;FCK.InitializeBehaviors();if (!FCKConfig.DisableEnterKeyHandler) FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){var A='';var B=FCKConfig.EditorAreaCSS;for (var i=0;i<B.length;i++) A+='<link href="'+B[i]+'" rel="stylesheet" type="text/css" />';return A;};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){if (B=='Paste') return!FCK.Events.FireEvent('OnPaste');}else{if (B.Equals('Paste','Undo','Redo','SelectAll')) return false;};var C=FCK.Commands.GetCommand(B);return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]==null;this.Elements.length=0;}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){FCK.Focus();FCKFocusManager_Win_OnFocus();};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};
-FCK.Description="FCKeditor for Internet Explorer 5.5+";FCK._GetBehaviorsStyle=function(){if (!FCK._BehaviorsStyle){var A=FCKConfig.FullBasePath;var B='';var C;C='<style type="text/css" _fcktemp="true">';if (FCKConfig.ShowBorders) B='url('+A+'css/behaviors/showtableborders.htc)';C+='INPUT,TEXTAREA,SELECT,.FCK__Anchor,.FCK__PageBreak,.FCK__InputHidden';if (FCKConfig.DisableObjectResizing){C+=',IMG';B+=' url('+A+'css/behaviors/disablehandles.htc)';};C+=' { behavior: url('+A+'css/behaviors/disablehandles.htc) ; }';if (B.length>0) C+='TABLE { behavior: '+B+' ; }';C+='</style>';FCK._BehaviorsStyle=C;};return FCK._BehaviorsStyle;};function Doc_OnMouseUp(){if (FCK.EditorWindow.event.srcElement.tagName=='HTML'){FCK.Focus();FCK.EditorWindow.event.cancelBubble=true;FCK.EditorWindow.event.returnValue=false;}};function Doc_OnPaste(){return (FCK.Status==2&&FCK.Events.FireEvent("OnPaste"));};function Doc_OnKeyDown(){if (FCK.EditorWindow){var e=FCK.EditorWindow.event;if (!(e.keyCode>=16&&e.keyCode<=18)) Doc_OnKeyDownUndo();};return true;};function Doc_OnKeyDownUndo(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}};function Doc_OnDblClick(){FCK.OnDoubleClick(FCK.EditorWindow.event.srcElement);FCK.EditorWindow.event.cancelBubble=true;};function Doc_OnSelectionChange(){FCK.Events.FireEvent("OnSelectionChange");};FCK.InitializeBehaviors=function(A){this.EditorDocument.attachEvent('onmouseup',Doc_OnMouseUp);this.EditorDocument.body.attachEvent('onpaste',Doc_OnPaste);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument.body);if (FCKConfig.TabSpaces>0){window.FCKTabHTML='';for (i=0;i<FCKConfig.TabSpaces;i++) window.FCKTabHTML+="&nbsp;";};this.EditorDocument.attachEvent("onkeydown",Doc_OnKeyDown);this.EditorDocument.attachEvent("ondblclick",Doc_OnDblClick);this.EditorDocument.attachEvent("onselectionchange",Doc_OnSelectionChange);};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCK.EditorWindow.focus();FCKUndo.SaveUndoStep();var B=FCK.EditorDocument.selection;if (B.type.toLowerCase()=='control') B.clear();B.createRange().pasteHTML(A);FCKDocumentProcessor.Process(FCK.EditorDocument);};FCK.SetInnerHtml=function(A){var B=FCK.EditorDocument;B.body.innerHTML='<div id="__fakeFCKRemove__">&nbsp;</div>'+A;B.getElementById('__fakeFCKRemove__').removeNode(true);};function FCK_PreloadImages(){var A=new FCKImagePreloader();A.AddImages(FCKConfig.PreloadImages);A.AddImages(FCKConfig.SkinPath+'fck_strip.gif');A.OnComplete=LoadToolbarSetup;A.Start();};function Document_OnContextMenu(){return (event.srcElement._FCKShowContextMenu==true);};document.oncontextmenu=Document_OnContextMenu;function FCK_Cleanup(){this.EditorWindow=null;this.EditorDocument=null;};FCK.Paste=function(){if (FCK._PasteIsRunning) return true;if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};var A=FCK._CheckIsPastingEnabled(true);if (A===false) FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security']);else{if (FCKConfig.AutoDetectPasteFromWord&&A.length>0){var B=/<\w[^>]*(( class="?MsoNormal"?)|(="mso-))/gi;if (B.test(A)){if (confirm(FCKLang.PasteWordConfirm)){FCK.PasteFromWord();return false;}}};FCK._PasteIsRunning=true;FCK.ExecuteNamedCommand('Paste');delete FCK._PasteIsRunning;};return false;};FCK.PasteAsPlainText=function(){if (!FCK._CheckIsPastingEnabled()){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText');return;};var A=clipboardData.getData("Text");if (A&&A.length>0){A=FCKTools.HTMLEncode(A).replace(/\n/g,'<BR>');this.InsertHtml(A);}};FCK._CheckIsPastingEnabled=function(A){FCK._PasteIsEnabled=false;document.body.attachEvent('onpaste',FCK_CheckPasting_Listener);var B=FCK.GetClipboardHTML();document.body.detachEvent('onpaste',FCK_CheckPasting_Listener);if (FCK._PasteIsEnabled){if (!A) B=true;}else B=false;delete FCK._PasteIsEnabled;return B;};function FCK_CheckPasting_Listener(){FCK._PasteIsEnabled=true;};FCK.InsertElement=function(A){FCK.InsertHtml(A.outerHTML);};FCK.GetClipboardHTML=function(){var A=document.getElementById('___FCKHiddenDiv');if (!A){A=document.createElement('DIV');A.id='___FCKHiddenDiv';var B=A.style;B.position='absolute';B.visibility=B.overflow='hidden';B.width=B.height=1;document.body.appendChild(A);};A.innerHTML='';var C=document.body.createTextRange();C.moveToElementText(A);C.execCommand('Paste');var D=A.innerHTML;A.innerHTML='';return D;};FCK.AttachToOnSelectionChange=function(A){this.Events.AttachEvent('OnSelectionChange',A);};FCK.CreateLink=function(A){FCK.ExecuteNamedCommand('Unlink');if (A.length>0){var B='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',B);var C=this.EditorDocument.links;for (i=0;i<C.length;i++){var D=C[i];if (D.href==B){var E=D.innerHTML;D.href=A;D.innerHTML=E;return D;}}};return null;};
+FCK.Description="FCKeditor for Internet Explorer 5.5+";FCK._GetBehaviorsStyle=function(){if (!FCK._BehaviorsStyle){var A=FCKConfig.FullBasePath;var B='';var C;C='<style type="text/css" _fcktemp="true">';if (FCKConfig.ShowBorders) B='url('+A+'css/behaviors/showtableborders.htc)';C+='INPUT,TEXTAREA,SELECT,.FCK__Anchor,.FCK__PageBreak,.FCK__InputHidden';if (FCKConfig.DisableObjectResizing){C+=',IMG';B+=' url('+A+'css/behaviors/disablehandles.htc)';};C+=' { behavior: url('+A+'css/behaviors/disablehandles.htc) ; }';if (B.length>0) C+='TABLE { behavior: '+B+' ; }';C+='</style>';FCK._BehaviorsStyle=C;};return FCK._BehaviorsStyle;};function Doc_OnMouseUp(){if (FCK.EditorWindow.event.srcElement.tagName=='HTML'){FCK.Focus();FCK.EditorWindow.event.cancelBubble=true;FCK.EditorWindow.event.returnValue=false;}};function Doc_OnPaste(){return (FCK.Status==2&&FCK.Events.FireEvent("OnPaste"));};function Doc_OnKeyDown(){if (FCK.EditorWindow){var e=FCK.EditorWindow.event;if (!(e.keyCode>=16&&e.keyCode<=18)) Doc_OnKeyDownUndo();};return true;};function Doc_OnKeyDownUndo(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}};function Doc_OnDblClick(){FCK.OnDoubleClick(FCK.EditorWindow.event.srcElement);FCK.EditorWindow.event.cancelBubble=true;};function Doc_OnSelectionChange(){FCK.Events.FireEvent("OnSelectionChange");};FCK.InitializeBehaviors=function(A){this.EditorDocument.attachEvent('onmouseup',Doc_OnMouseUp);this.EditorDocument.body.attachEvent('onpaste',Doc_OnPaste);if (FCKConfig.ContextMenu!=null)FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument.body);if (FCKConfig.TabSpaces>0){window.FCKTabHTML='';for (i=0;i<FCKConfig.TabSpaces;i++) window.FCKTabHTML+="&nbsp;";};this.EditorDocument.attachEvent("onkeydown",Doc_OnKeyDown);this.EditorDocument.attachEvent("ondblclick",Doc_OnDblClick);this.EditorDocument.attachEvent("onselectionchange",Doc_OnSelectionChange);};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCK.EditorWindow.focus();FCKUndo.SaveUndoStep();var B=FCK.EditorDocument.selection;if (B.type.toLowerCase()=='control') B.clear();B.createRange().pasteHTML(A);FCKDocumentProcessor.Process(FCK.EditorDocument);};FCK.SetInnerHtml=function(A){var B=FCK.EditorDocument;B.body.innerHTML='<div id="__fakeFCKRemove__">&nbsp;</div>'+A;B.getElementById('__fakeFCKRemove__').removeNode(true);};function FCK_PreloadImages(){var A=new FCKImagePreloader();A.AddImages(FCKConfig.PreloadImages);A.AddImages(FCKConfig.SkinPath+'fck_strip.gif');A.OnComplete=LoadToolbarSetup;A.Start();};function Document_OnContextMenu(){return (event.srcElement._FCKShowContextMenu==true);};document.oncontextmenu=Document_OnContextMenu;function FCK_Cleanup(){this.EditorWindow=null;this.EditorDocument=null;};FCK.Paste=function(){if (FCK._PasteIsRunning) return true;if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};var A=FCK._CheckIsPastingEnabled(true);if (A===false) FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security']);else{if (FCKConfig.AutoDetectPasteFromWord&&A.length>0){var B=/<\w[^>]*(( class="?MsoNormal"?)|(="mso-))/gi;if (B.test(A)){if (confirm(FCKLang.PasteWordConfirm)){FCK.PasteFromWord();return false;}}};FCK._PasteIsRunning=true;FCK.ExecuteNamedCommand('Paste');delete FCK._PasteIsRunning;};return false;};FCK.PasteAsPlainText=function(){if (!FCK._CheckIsPastingEnabled()){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText');return;};var A=clipboardData.getData("Text");if (A&&A.length>0){A=FCKTools.HTMLEncode(A).replace(/\n/g,'<BR>');this.InsertHtml(A);}};FCK._CheckIsPastingEnabled=function(A){FCK._PasteIsEnabled=false;document.body.attachEvent('onpaste',FCK_CheckPasting_Listener);var B=FCK.GetClipboardHTML();document.body.detachEvent('onpaste',FCK_CheckPasting_Listener);if (FCK._PasteIsEnabled){if (!A) B=true;}else B=false;delete FCK._PasteIsEnabled;return B;};function FCK_CheckPasting_Listener(){FCK._PasteIsEnabled=true;};FCK.InsertElement=function(A){FCK.InsertHtml(A.outerHTML);};FCK.GetClipboardHTML=function(){var A=document.getElementById('___FCKHiddenDiv');if (!A){A=document.createElement('DIV');A.id='___FCKHiddenDiv';var B=A.style;B.position='absolute';B.visibility=B.overflow='hidden';B.width=B.height=1;document.body.appendChild(A);};A.innerHTML='';var C=document.body.createTextRange();C.moveToElementText(A);C.execCommand('Paste');var D=A.innerHTML;A.innerHTML='';return D;};FCK.AttachToOnSelectionChange=function(A){this.Events.AttachEvent('OnSelectionChange',A);};FCK.CreateLink=function(A){FCK.ExecuteNamedCommand('Unlink');if (A.length>0){var B='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',B);var C=this.EditorDocument.links;for (i=0;i<C.length;i++){var D=C[i];if (D.href==B){var E=D.innerHTML;D.href=A;D.innerHTML=E;return D;}}};return null;};
 var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi, '/');FCKConfig.BasePath='file://'+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;}else{FCKConfig.BasePath=document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=document.location.protocol+'//'+document.location.host+FCKConfig.BasePath;};FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {/*Ignore it. Much probably we are inside a FRAME where the "top" is in another domain (security error).*/}};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';if (typeof(A.EditorAreaCSS)=='string') A.EditorAreaCSS=[A.EditorAreaCSS];var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;else if (typeof(B)=='string') A.ToolbarComboPreviewCSS=[B];};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.AddItem([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.AddItem(A);};FCKConfig.ProtectedSource.Protect=function(A){function _Replace(protectedSource){var B=FCKTempBin.AddElement(protectedSource);return '<!--{PS..'+B+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};return A.replace(/(<|&lt;)!--\{PS..(\d+)\}--(>|&gt;)/g,_Replace);}
 var FCKDebug={};FCKDebug._GetWindow=function(){if (!this.DebugWindow||this.DebugWindow.closed) this.DebugWindow=window.open(FCKConfig.BasePath+'fckdebug.html','FCKeditorDebug','menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500',true);return this.DebugWindow;};FCKDebug.Output=function(A,B,C){if (!FCKConfig.Debug) return;try{this._GetWindow().Output(A,B);}catch (e) {}};FCKDebug.OutputObject=function(A,B){if (!FCKConfig.Debug) return;try{this._GetWindow().OutputObject(A,B);}catch (e) {}}
 var FCKDomTools={MoveChildren:function(A,B){if (A==B) return;var C;while ((C=A.firstChild)) B.appendChild(A.removeChild(C));},TrimNode:function(A,B){this.LTrimNode(A);this.RTrimNode(A,B);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A,B){var C;while ((C=A.lastChild)){switch (C.nodeType){case 1:if (C.nodeName.toUpperCase()=='BR'&&(B||C.getAttribute('type',2)=='_moz')){A.removeChild(C);continue;};break;case 3:var D=C.nodeValue.RTrim();var E=C.nodeValue.length;if (D.length==0){C.parentNode.removeChild(C);continue;}else if (D.length<E){C.splitText(D.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D){if (!A) return null;if (A.nextSibling) A=A.nextSibling;else return this.GetNextSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.firstChild) A=A.firstChild;else return this.GetNextSourceElement(A,B,C,D);};return null;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.splice(0,0,A);A=A.parentNode;};return B;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;}};
diff --git a/phpgwapi/setup/tables_update_1_0.inc.php b/phpgwapi/setup/tables_update_1_0.inc.php
index 6eab60e639..241ef6eb66 100644
--- a/phpgwapi/setup/tables_update_1_0.inc.php
+++ b/phpgwapi/setup/tables_update_1_0.inc.php
@@ -151,7 +151,7 @@
 			),
 			'pk' => array('vfs_file_id'),
 			'fk' => array(),
-			'ix' => array(array('vfs_directory','vfs_name','vfs_mime_type')),
+			'ix' => array(array('vfs_directory','vfs_name')),
 			'uc' => array()
 		));
 
diff --git a/phpgwapi/templates/default/footer.tpl b/phpgwapi/templates/default/footer.tpl
index 45d53c7292..512f810486 100644
--- a/phpgwapi/templates/default/footer.tpl
+++ b/phpgwapi/templates/default/footer.tpl
@@ -7,7 +7,7 @@
 </div>
 </div>
 {page_generation_time}	
-<div id="divPoweredBy"><br/><span>{powered_by}</span></div>	
+<div id="divPoweredBy">{powered_by}</div>	
 <!-- enable wz_tooltips -->
 {activate_tooltips}
 </body>
diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css
index bd0351be5f..a494d7dca2 100755
--- a/phpgwapi/templates/idots/css/idots.css
+++ b/phpgwapi/templates/idots/css/idots.css
@@ -94,7 +94,6 @@ input,button,select
 input[type=submit],input[type=button],input[type=reset],button,.egwbutton
 
 {
-/*	color:white;*/
 	background-color:#c5c5c5;
 	border:  outset 1px #dcdad5;
 	background-color:#b9d5e3;
@@ -103,7 +102,6 @@ input[type=submit],input[type=button],input[type=reset],button,.egwbutton
 	padding: 1px;
 	cursor:  pointer; 
 	color:  #004e7d;
-/*	cursor:  hand; */
 }
 
 input[type=submit]:hover,input[type=button]:hover,input[type=reset]:hover,button:hover,.egwbutton:hover
@@ -130,7 +128,6 @@ input.egwbutton
 	padding: 1px;
 	cursor:  pointer; 
 	color:  #004e7d;
-/*	cursor:  hand; */
 }
 
 input.egwbutton:hover
@@ -149,7 +146,6 @@ input.egwbutton:active
 input[type=image]
 {
 	cursor: pointer; 
-/*	cursor: hand; */
 	border: 0;
 }
 
@@ -194,7 +190,6 @@ input[type=image]
 a.divSideboxEntry, .divSideboxEntry
 {
 	text-align:left;
-	height:16px;
 	background-color:#FDFDFD;
 }
 
@@ -212,9 +207,8 @@ a.textSidebox
 
 .textSidebox
 {
-	height:18px;
-	padding-top:2px;
-	padding-bottom:2px;
+	padding-top:3px;
+	padding-bottom:3px;
 	border-top: solid #aaaaaa 1px;
 }
 /* 
@@ -253,19 +247,27 @@ body {
 	margin: 0px;
 }
 
-#divMain,#loginMainDiv
+#divMain,#loginMainDiv,#popupMainDiv
 {
 	background-color: white;
 	padding: 8px;
+	border-bottom: solid 1px #7e7e7e;
+}
+/*
+ ** Popups
+ */
+#popupMainDiv
+{
 	margin: 8px;
 	border: solid 1px #7e7e7e;
-}
+	padding-bottom: 0px;
+}	
 
 #divLogo
 {
 	position:absolute;
 	left:30px;
-	top:15px;
+	top:6px;
 	z-index:999;
 }
 
@@ -274,7 +276,7 @@ body {
 	background-color: #0081c1;
 	background-image: url(../images/bgtopmenu2.png);
 	color:#006699;
-	border-top: solid 2px #7e7e7e;
+	/*border-top: solid 1px #7e7e7e;*/
 	border-bottom: solid #5793ff 1px;
 	height:20px;
 	padding-top:4px ;
@@ -337,7 +339,6 @@ body {
 	background-color:white;
 	height:18px;
 	padding-left:3px;
-	margin-top: 10px;
 }
 
 #tdSidebox
@@ -358,7 +359,8 @@ body {
 {
 	background-image:url(../images/appbox-header-background.png);
 	background-repeat: repeat-x;
-	height:36px;
+	height: 25px;
+	border-bottom:solid 1px #c0c0c0;
 	text-align:center;
 	padding-bottom:0px;
 	border-top:solid 1px #9c9c9c;
diff --git a/phpgwapi/templates/idots/print.css b/phpgwapi/templates/idots/print.css
index 16d0422a36..16b1dad929 100644
--- a/phpgwapi/templates/idots/print.css
+++ b/phpgwapi/templates/idots/print.css
@@ -34,7 +34,9 @@ table {
 
 /* nextmatch/list rows */
 tr.row_on,tr.row_off{
-	border-bottom: thin black dashed;
+	border-bottom: thin gray dotted;
+	padding-top: 0px; margin-top:0px;
+	padding-bottom: 0px; margin-bottom: 0px;
 }
 
 /* nextmatch/list headers */
diff --git a/phpgwapi/templates/jerryr/css/brushed-metal.css b/phpgwapi/templates/jerryr/css/brushed-metal.css
index 892db7b355..73ccc868d3 100644
--- a/phpgwapi/templates/jerryr/css/brushed-metal.css
+++ b/phpgwapi/templates/jerryr/css/brushed-metal.css
@@ -156,24 +156,23 @@ input[type=image]
 
 #thesideboxcolumn
 {
-        width: 203px;
-        position:relative;
+	width: 203px;
+	position:relative;
 }
 
 #sideresize
 {
-        background-image:url(../images/resize-bm.png);
-        width:16px;
-        height:100px;
-        right:-18px;
-        top:0px;
-        position:absolute;
-        z-index:9999;
+	background-image:url(../images/resize-bm.png);
+	width:16px;
+	height:100px;
+	right:-18px;
+	top:0px;
+	position:absolute;
+	z-index:9999;
 }
 
 #tdSidebox
 {
-	/*width:204px;*/
 	overflow:visible;
 }
 
@@ -186,25 +185,20 @@ input[type=image]
 
 .divSidebox 
 {
-	/*width: 188px;*/
 	position: relative; 
 	border: 0px solid #9f9f9f;
-	/*background-image: url(../images/bmback2.jpg);*/
 	background-color: white;
 }
 
 .divLoginboxHeader,.divSideboxHeader,a.appTitles,.appTitles,a.textSidebox,.textSidebox,#fmStatusBar
 {
 	font-size:90%;
-	white-space: nowrap;
 }
 
 .textSideboxStar
 {
 	width: 20px;
 	font-size:90%;
-	/*background-image: url(../images/rowoff-bm.png);*/
-	/*background-color: white:*/
 	border-top:1px solid #e1e1e1;
 	border-right: 1px solid #e1e1e1;
 	border-left: 0px solid #9f9f9f;
@@ -213,14 +207,13 @@ input[type=image]
 .divSideboxHeader,.divLoginboxHeader 
 {
 	text-align:center;
-	/*background-image:url(../images/menuTitle-bm.png);*/	
 	color: #666666;
 	height: 23px;
 	font-weight:bold;
 	font-size:12px;
 	position: relative;
-        left: 0px;
-        top: 0px;
+	left: 0px;
+	top: 0px;
 	padding:0px;
 	border-top: 0px solid #9f9f9f;
 	border-left: 0px solid #9f9f9f;
@@ -229,46 +222,46 @@ input[type=image]
 
 .menuHeadLt
 {
-        background-image:url(../images/menuTitleLt-bm.png);
-        padding:0px;
-        width: 24px;
-        height:23px;
+	background-image:url(../images/menuTitleLt-bm.png);
+	padding:0px;
+	width: 24px;
+	height:23px;
 }
 .menuHeadMid
 {
-        background-image:url(../images/menuTitleMid-bm.png);
- 	width: 100%;
+	background-image:url(../images/menuTitleMid-bm.png);
+	width: 100%;
 	line-height:23px;
 }
 
 .menuHeadRt
 {
-        background-image:url(../images/menuTitleRt-bm.png);
-        width:24px;
-        padding:0px;
-        height: 23px;
+	background-image:url(../images/menuTitleRt-bm.png);
+	width:24px;
+	padding:0px;
+	height: 23px;
 }
 
 .menuBotLt
 {
-        background-image:url(../images/menuBotLt-bm.png);
-        padding:0px;
-        width: 20px;
-        height:18px;
+	background-image:url(../images/menuBotLt-bm.png);
+	padding:0px;
+	width: 20px;
+	height:18px;
 }
 .menuBotMid
 {
-        background-image:url(../images/menuBotMid-bm.png);
-        width: 100%;
-        line-height:18px;
+	background-image:url(../images/menuBotMid-bm.png);
+	width: 100%;
+	line-height:18px;
 }
 
 .menuBotRt
 {
-        background-image:url(../images/menuBotRt-bm.png);
-        width:20px;
-        padding:0px;
-        height: 18px;
+	background-image:url(../images/menuBotRt-bm.png);
+	width:20px;
+	padding:0px;
+	height: 18px;
 }
 
 
@@ -276,8 +269,6 @@ a.divSideboxEntry, .divSideboxEntry
 {
 	text-align:left;
 	height:18px;
-	/*background-image:url(../images/bmback2.jpg);*/
-	/*background-color:#ffffff;*/
 	border-left: 0px solid #9f9f9f;
 }
 
@@ -301,9 +292,6 @@ a.textSidebox
 
 .textSideboxHover
 {
-	/*background-image: url(../images/arrow-rt-grey.png);*/
-	/*background-repeat: no-repeat;*/
-	/*background-position: top right;*/
 	background-color: white;
 	height: 18px;
 	border-top: 1px solid #e1e1e1;
@@ -336,9 +324,9 @@ a.textSidebox
 
 .sideboxDrop
 {
-position: relative;
-        left: 0px;
-        top: 0px;
+	position: relative;
+	left: 0px;
+	top: 0px;
 	border-bottom: 0px solid white;
 	border-left: 1px solid #9f9f9f;
 	border-right: 1px solid #9f9f9f;
@@ -352,7 +340,6 @@ position: relative;
 .sideboxSpace
 {
 	height:29px;
-	/*background-image: url(../images/botspacer.png);*/
 }
 
 /*
@@ -380,9 +367,9 @@ position: relative;
 
 .menuOneBoxTwo
 {
-        position: relative;
-        left: 0;
-        text-align: left;
+	position: relative;
+	left: 0;
+	text-align: left;
 }
 
 
@@ -406,11 +393,11 @@ position: relative;
 
 .extraIconsHeader
 {
-        text-align:center;
-        background-image:url(../images/menuTitle-bm.png);
+	text-align:center;
+	background-image:url(../images/menuTitle-bm.png);
 	color:#e1e1e1;
-        font-weight:normal;
-        font-size:10px;
+	font-weight:normal;
+	font-size:10px;
 	height: 23px;
 }
 
@@ -424,23 +411,21 @@ position: relative;
 
 .extraIconsRow
 {
-        border-top: 1px solid #e1e1e1;
+	border-top: 1px solid #e1e1e1;
 	height: 19px;
-        padding:1px;
+	padding:1px;
 	padding-left: 3px;
-        font-size: 10px;
+	font-size: 10px;
 	background-color: white;
-	/*background-image:url(../images/bmback2.jpg);*/
 }
 
 .extraIconsRow:hover
 {
-        border-top: 1px solid #e1e1e1;
-        padding:1px;
+	border-top: 1px solid #e1e1e1;
+	padding:1px;
 	padding-left: 3px;
-        font-size: 10px;
+	font-size: 10px;
 	background-color: #e1e1e1;
-	/*background-image:url(../images/bmback.jpg);*/
 }
 
 /*
@@ -451,13 +436,17 @@ body {
 	padding: 0px;
 }
 
-#divMain
+#divMain,#popupMainDiv
 {
 	background-image:url(../images/bmback.jpg);
 	background-color: #646464;
 	padding:9px;
 	margin: 0px;
-	border-bottom: 2px solid white;
+}
+
+#popupMainDiv
+{
+	margin: 9px;
 }
 
 #divLogo
@@ -470,27 +459,27 @@ body {
 
 #topmenu
 {
-        background-color: #0081c1;
-        background-image: url(../images/hilitetest-bm.png);
-        color:#006699;
-        border-top: 1px solid #9f9f9f;
-        border-bottom: 1px solid #9f9f9f;
+	background-color: #0081c1;
+	background-image: url(../images/hilitetest-bm.png);
+	color:#006699;
+	border-top: 1px solid #9f9f9f;
+	border-bottom: 1px solid #9f9f9f;
 	height:24px;
 	line-height:20px;
 	padding-top: 4px;
 }
 #topmenu a
 {
-        color:#006699;
+	color:#006699;
 }
 
 #topmenu_items
 {
-        float:left;
+	float:left;
 }
 #topmenu_info
 {
-        float:right;
+	float:right;
 }
 
 #divUpperTabs
@@ -543,8 +532,8 @@ body {
 
 .iconBackFirstCell
 {
-        background-image: url(../images/firstcell-bm.png);
-        background-repeat: no-repeat;
+	background-image: url(../images/firstcell-bm.png);
+	background-repeat: no-repeat;
 	height:60px;
 }
 
@@ -560,7 +549,6 @@ body {
 
 .iconBack
 {
-	/*background-image: url(../images/iconbar-bm.png);*/
 	border-right: 0px solid #bfbfbf;
 	border-top: 1px solid #9f9f9f;
 	height: 38px;
@@ -584,7 +572,6 @@ body {
 
 #divAppTextBar
 {
-	/*background-color:white;*/
 	white-space: nowrap;
 }
 
@@ -631,23 +618,20 @@ body {
 
 .appBoxHeadLt
 {
-        background-image:url(../images/abhlt.png);
-	/*background-image:url(../images/menuTitleLt-bm.png);*/
+	background-image:url(../images/abhlt.png);
 	padding:0px;
 	width: 24px;
 	height:24px;
 }
 .appBoxHeadMid
 {
-        background-image:url(../images/abhmid.png);
-	/*background-image:url(../images/menuTitleMid-bm.png);*/
+	background-image:url(../images/abhmid.png);
 	padding:0px;
 	line-height:24px;
 }
 .appBoxHeadRt
 {
-        background-image:url(../images/abhrt.png);
-	/*background-image:url(../images/menuTitleRt-bm.png);*/
+	background-image:url(../images/abhrt.png);
 	width:24px;
 	padding:0px;
 	height: 24px;
@@ -690,13 +674,13 @@ body {
 	background-image: url(../images/hilitetest-bm.png);
 }
 .row_on {
-        color: black;
-        background-color: #F1F1F1;
+	color: black;
+	background-color: #F1F1F1;
 	background-image: url(../images/rowon-bm.png);
 }
 .row_off {
-        color: black;
-        background-color: #ffffff;
+	color: black;
+	background-color: #ffffff;
 	background-image: url(../images/rowoff-bm.png);
 }
 .narrow_column { width: 1%; white-space: nowrap; }
@@ -711,16 +695,16 @@ body {
         Portal_box as used in home
 */
 .portal_box {
-        border: #9c9c9c 1px solid;
+	border: #9c9c9c 1px solid;
 }
 
 .portal_box table {
-        border: 1px solid black;
+	border: 1px solid black;
 }
 
 .portal_box_header {
-        height: 15px;
-        padding-top: 0px;
+	height: 15px;
+	padding-top: 0px;
 }
 
 /*
@@ -728,8 +712,8 @@ body {
 */
 .tablink
 {
-        white-space: nowrap;
+	white-space: nowrap;
 	padding-left: 15px;
-        padding-right: 15px;
+	padding-right: 15px;
 }
 
diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css
index 0e4a8e044e..05bcf2652a 100644
--- a/phpgwapi/templates/jerryr/css/jerryr.css
+++ b/phpgwapi/templates/jerryr/css/jerryr.css
@@ -60,8 +60,8 @@ a:hover,a:active
 body 
 {
 	background-color:#9f9f9f;
-	padding:9px;
-	margin:9px;
+	padding: 0px;
+	margin: 0px;
 }
 
 form
@@ -155,19 +155,19 @@ input[type=image]
 
 #thesideboxcolumn
 {
-        width: 177px;
-        position:relative;
+    width: 177px;
+    position:relative;
 }
 
 #sideresize
 {
-        background-image:url(../images/resize.png);
-        width:10px;
-        height:100px;
-        right:-12px;
-        top:0px;
-        position:absolute;
-        z-index:9999;
+    background-image:url(../images/resize.png);
+    width:10px;
+    height:100px;
+    right:-12px;
+    top:0px;
+    position:absolute;
+    z-index:9999;
 }
 
 .divLoginbox 
@@ -202,28 +202,28 @@ input[type=image]
 	text-align:center;
 	background-image:url(../images/menuTitle.png);
 	color:#17202b;
-	height: 18px;
+	/*height: 18px;*/
 	font-weight:bold;
 	font-size:12px;
 }
 
 .menuHeadLt
 {
-        padding:0px;
-        width: 24px;
-        height:18px;
+    padding:0px;
+    width: 24px;
+    height:18px;
 }
 .menuHeadMid
 {
-        padding:0px;
-        margin-left: auto;
+    padding:0px;
+    margin-left: auto;
 	margin-right: auto;
 }
 .menuHeadRt
 {
-        width:24px;
-        padding:0px;
-        height: 18px;
+    width:24px;
+    padding:0px;
+    height: 18px;
 }
 
 
@@ -247,7 +247,6 @@ a.textSidebox
 
 .textSidebox
 {
-	height:18px;
 	padding-left: 2px;
 	border-top: solid #9f9f9f 1px;
 }
@@ -278,17 +277,17 @@ a.textSidebox
 {
 	background-image: url(../images/divmain-background.jpg);
 	background-repeat: no-repeat;
-        background-color:white;
-        border: #17202b 1px solid;
-        padding:10px;
+    background-color:white;
+    border: #17202b 1px solid;
+    padding:10px;
 	width: 203px;
 }
 
 .sideboxDrop
 {
-position: relative;
-        left: 0px;
-        top: 0px;
+	position: relative;
+	left: 0px;
+	top: 0px;
 }
 
 .textSidebox:first-letter
@@ -343,11 +342,11 @@ position: relative;
 
 .extraIconsHeader
 {
-        text-align:center;
-        background-image:url(../images/menuTitle.png);
-        color:#17202b;
-        font-weight:normal;
-        font-size:10px;
+    text-align:center;
+    background-image:url(../images/menuTitle.png);
+    color:#17202b;
+    font-weight:normal;
+    font-size:10px;
 	height: 18px;
 }
 
@@ -370,10 +369,10 @@ position: relative;
 
 .extraIconsRow:hover
 {
-        border-top:solid 1px #9f9f9f;
-        padding:1px;
+	border-top:solid 1px #9f9f9f;
+	padding:1px;
 	padding-left: 3px;
-        font-size: 10px;
+	font-size: 10px;
 	background-color: #ede6d8;
 }
 
@@ -385,12 +384,13 @@ body {
 	padding: 0px;
 }
 
-#divMain
+#divMain,#popupMainDiv
 {
 	background-image:url(../images/divmain-background.jpg);
 	background-repeat:no-repeat;
 	background-color:white;
 	padding:9px;
+	padding-top: 0px;	/* CHANGED RALF */
 	border:solid 1px #17202b;
 }
 
@@ -398,36 +398,42 @@ body {
 {
 	position:absolute;
 	left:27px;
-	top:28px;
+	top:20px;
 	z-index:999;
 }
 
+#popupMainDiv
+{
+	padding:9px;
+	margin: 9px;
+}
+
 #topmenu
 {
-        background-color: #0081c1;
-        background-image: url(../images/hilitetest.png);
-        color:#006699;
-        border-top: solid 1px #17202b;
+	background-color: #0081c1;
+	background-image: url(../images/hilitetest.png);
+	color:#006699;
+	border-top: solid 1px #17202b;
 	border-right: 1px solid #17202b;
 	border-left: 1px solid #17202b;
-        border-bottom: solid #5793ff 0px;
-        height:24px;
-        padding-top:4px ;
+	border-bottom: solid #5793ff 0px;
+	height:24px;
+	padding-top:4px ;
         
 }
 #topmenu a
 {
-        color:#006699;
+	color:#006699;
 }
 
 #topmenu_items
 {	
-        float:left;
+	float:left;
 }
 
 #topmenu_info
 {
-        float:right;
+	float:right;
 }
 
 
@@ -468,7 +474,7 @@ body {
 
 .iconBackFirstCell
 {
-        background-image: url(../images/firstcell.png);
+	background-image: url(../images/firstcell.png);
 	background-repeat: no-repeat;
 	height: 58px;
 }
@@ -500,7 +506,6 @@ body {
 
 #divAppTextBar
 {
-	/*background-color:white;*/
 }
 
 /*
@@ -512,7 +517,6 @@ body {
 	position: relative;
 	top:0px;
 	left:0px;
-	height:30px;
 	vertical-align:bottom;
 	border: 0px solid black;
 	padding-top:10px;
@@ -520,22 +524,22 @@ body {
 
 .userinfolt
 {
-        background-image: url(../images/userbacklt.png);
-        width: 20px;
-        height: 25px;
+	background-image: url(../images/userbacklt.png);
+	width: 20px;
+	height: 25px;
 }
 
 .userinfomid
 {
-        background-image: url(../images/userback.png);
-        background-repeat: repeat-x;
-        color: #000000;
+	background-image: url(../images/userback.png);
+	background-repeat: repeat-x;
+	color: #000000;
 }
 
 .userinfort
 {
-        background-image: url(../images/userbackrt.png);
-        width: 20px;
+	background-image: url(../images/userbackrt.png);
+	width: 20px;
 }
 
 
diff --git a/resources/inc/class.bo_resources.inc.php b/resources/inc/class.bo_resources.inc.php
index 056f9e55cd..8bc97ae01b 100755
--- a/resources/inc/class.bo_resources.inc.php
+++ b/resources/inc/class.bo_resources.inc.php
@@ -492,7 +492,7 @@ class bo_resources
 			case 'gen_src':
 			default :
 				$picture = $GLOBALS['egw_info']['server']['webserver_url'].$this->resource_icons;
-				$picture .= strstr($src,'.') ? $src : 'generic.png';
+				$picture .= strpos($src,'.') !== false ? $src : 'generic.png';
 		}
 		return $picture;
 	}
diff --git a/resources/inc/class.ui_resources.inc.php b/resources/inc/class.ui_resources.inc.php
index d4abedd310..f32ecf940c 100755
--- a/resources/inc/class.ui_resources.inc.php
+++ b/resources/inc/class.ui_resources.inc.php
@@ -219,8 +219,8 @@ class ui_resources
 			if ($res_id > 0)
 			{
 				$content = $this->bo->read($res_id);
-				$content['gen_src_list'] = strstr($content['picture_src'],'.') ? $content['picture_src'] : false;
-				$content['picture_src'] = strstr($content['picture_src'],'.') ? 'gen_src' : $content['picture_src'];
+				$content['gen_src_list'] = strpos($content['picture_src'],'.') !== false ? $content['picture_src'] : false;
+				$content['picture_src'] = strpos($content['picture_src'],'.') !== false ? 'gen_src' : $content['picture_src'];
 				$content['link_to'] = array(
 					'to_id' => $res_id,
 					'to_app' => 'resources'
@@ -310,8 +310,8 @@ class ui_resources
 
 		$content = array('res_id' => $res_id);
 		$content = $this->bo->read($res_id);
-		$content['gen_src_list'] = strstr($content['picture_src'],'.') ? $content['picture_src'] : false;
-		$content['picture_src'] = strstr($content['picture_src'],'.') ? 'gen_src' : $content['picture_src'];
+		$content['gen_src_list'] = strpos($content['picture_src'],'.') !== false ? $content['picture_src'] : false;
+		$content['picture_src'] = strpos($content['picture_src'],'.') !== false ? 'gen_src' : $content['picture_src'];
 		$content['link_to'] = array(
 				'to_id' => $res_id,
 				'to_app' => 'resources'
diff --git a/timesheet/inc/class.botimesheet.inc.php b/timesheet/inc/class.botimesheet.inc.php
index 85079cd9bd..388148dbeb 100644
--- a/timesheet/inc/class.botimesheet.inc.php
+++ b/timesheet/inc/class.botimesheet.inc.php
@@ -323,7 +323,7 @@ class botimesheet extends so_sql
 		
 		if ($only_summary) return $this->summary;
 
-		if ($this->show_sums && strstr($order_by,'ts_start') && 	// sums only make sense if ordered by ts_start
+		if ($this->show_sums && strpos($order_by,'ts_start') !== false && 	// sums only make sense if ordered by ts_start
 			$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
 		{
 			$sum_sql = array(
diff --git a/timesheet/inc/class.uitimesheet.inc.php b/timesheet/inc/class.uitimesheet.inc.php
index 7a436f1e57..b7308f73d5 100644
--- a/timesheet/inc/class.uitimesheet.inc.php
+++ b/timesheet/inc/class.uitimesheet.inc.php
@@ -86,7 +86,7 @@ class uitimesheet extends botimesheet
 				);
 			}
 			$referer = preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] : 
-				(strstr($_SERVER['HTTP_REFERER'],'/infolog/index.php') ? 'infolog.uiinfolog.index' : TIMESHEET_APP.'.uitimesheet.index');
+				(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.uiinfolog.index' : TIMESHEET_APP.'.uitimesheet.index');
 		}
 		else
 		{
@@ -635,6 +635,9 @@ class uitimesheet extends botimesheet
 			if (!is_array($projects)) $projects = array();
 			$sel_options['ts_project'] = $projects + array(lang('No project'));
 		}
+		// dont show [Export] button if app is not availible to the user or we are on php4
+		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int) phpversion() < 5;
+
 		return $etpl->exec(TIMESHEET_APP.'.uitimesheet.index',$content,$sel_options,$readonlys,$preserv);
 	}