diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index 9dce504842..4b9486825b 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -1,5 +1,5 @@
 <?php
-// eTemplates for Application 'infolog', generated by etemplate.dump() 2004-08-28 19:33
+// eTemplates for Application 'infolog', generated by etemplate.dump() 2004-09-18 11:39
 
 /* $Id$ */
 
@@ -41,6 +41,9 @@ $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','gr
 $templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '0.9.15.009','data' => 'a:11:{i:0;a:13:{s:1:"A";s:3:"103";s:1:"B";s:3:"300";s:1:"C";s:3:"100";s:2:"h5";s:3:"250";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:4:",top";s:2:"c6";s:2:"th";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"span";s:3:"all";s:4:"name";s:9:"info_type";s:8:"onchange";s:1:"1";s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"40,64";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"40,64";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}s:1:"B";a:6:{s:4:"type";s:4:"text";s:4:"size";s:5:"64,64";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:6:"needed";s:1:"1";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:5;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:41:"Description|Links|Delegation|Customfields";s:4:"name";s:41:"description|links|delegation|customfields";s:4:"help";s:78:"longer textual description|Links of this entry|responsible user, priority, ...";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:8;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:9;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:10;a:4:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:16:"Saves this entry";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:31:"leave without saveing the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:6:"delete";s:4:"help";s:17:"delete this entry";}}}','size' => '100%','style' => '.headertext { color: black; font-size: 120%; }
 .lpadding5 { padding-left: 5px; };','modified' => '1061627812',);
 
+$templ_data[] = array('name' => 'infolog.edit','template' => '','lang' => '','group' => '0','version' => '1.0.0.000','data' => 'a:11:{i:0;a:13:{s:1:"A";s:3:"103";s:1:"B";s:3:"350";s:1:"C";s:2:"50";s:2:"h5";s:3:"250";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:4:",top";s:2:"c6";s:2:"th";s:2:"c7";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"span";s:3:"all";s:4:"name";s:9:"info_type";s:8:"onchange";s:1:"1";s:4:"help";s:46:"Type of the log-entry: Note, Phonecall or ToDo";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";}s:1:"B";a:5:{s:4:"type";s:10:"select-cat";s:4:"size";s:4:"None";s:4:"span";s:3:"all";s:4:"name";s:8:"info_cat";s:4:"help";s:32:"select a category for this entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Contact";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"40,64";s:4:"name";s:9:"info_from";s:4:"help";s:80:"Custom contact-information, leave emtpy to use information from most recent link";s:4:"blur";s:11:"@blur_title";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Phone/Email";}s:1:"D";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"40,64";s:4:"name";s:9:"info_addr";s:4:"help";s:76:"Custom contact-address, leave empty to use information from most recent link";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Subject";}s:1:"B";a:6:{s:4:"type";s:4:"text";s:4:"size";s:5:"64,64";s:4:"span";s:3:"all";s:4:"name";s:12:"info_subject";s:6:"needed";s:1:"1";s:4:"help";s:29:"a short subject for the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:5;a:4:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:41:"Description|Links|Delegation|Customfields";s:4:"name";s:41:"description|links|delegation|customfields";s:4:"help";s:78:"longer textual description|Links of this entry|responsible user, priority, ...";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:21:"Dates, Status, Access";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Startdate";}s:1:"B";a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",2";s:4:"name";s:14:"info_startdate";s:4:"help";s:115:"when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}s:1:"D";a:3:{s:4:"type";s:4:"date";s:4:"name";s:12:"info_enddate";s:4:"help";s:49:"til when should the ToDo or Phonecall be finished";}}i:8;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:11:"info_status";s:4:"help";s:12:"@status_help";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:14:"private,public";s:4:"name";s:11:"info_access";s:4:"help";s:87:"should this entry only be visible to you and people you grant privat access via the ACL";}}i:9;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:10:"info_owner";s:8:"readonly";s:1:"1";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}s:1:"D";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"info_modifier";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"span";s:10:",lpadding5";s:4:"name";s:17:"info_datemodified";s:8:"readonly";s:1:"1";}}}i:10;a:4:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:4:"save";s:4:"help";s:16:"Saves this entry";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:6:"cancel";s:4:"help";s:31:"leave without saveing the entry";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:5:"align";s:5:"right";s:4:"name";s:6:"delete";s:4:"help";s:17:"delete this entry";}}}','size' => '100%','style' => '.headertext { color: black; font-size: 120%; }
+.lpadding5 { padding-left: 5px; };','modified' => '1095500337',);
+
 $templ_data[] = array('name' => 'infolog.edit.customfields','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:2:{i:0;a:1:{s:2:"h1";s:4:"100%";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";}}}','size' => '100%,100%,,,0,0','style' => '','modified' => '1061732462',);
 
 $templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang' => '','group' => '0','version' => '0.9.15.001','data' => 'a:7:{i:0;a:8:{s:1:"A";s:3:"100";s:2:"h6";s:3:"120";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:8:"Priority";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:8:"info_pri";s:4:"help";s:31:"select a priority for this task";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:10:"Delegation";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:5:"Owner";s:4:"name";s:16:"info_responsible";s:4:"help";s:66:"select a responsible user: a person you want to delegate this task";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Confirm";}s:1:"B";a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"info_confirm";s:4:"help";s:87:"do you want a confirmation of the responsible on: accepting, finishing the task or both";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}','size' => '100%','style' => '','modified' => '1034160051',);
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
new file mode 100644
index 0000000000..2f6d674dcf
--- /dev/null
+++ b/infolog/templates/default/edit.xet
@@ -0,0 +1,176 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<grid id="infolog.edit.description" template="" lang="" group="0" version="0.9.15.002" width="100%" border="0">
+		<columns>
+			<column width="100"/>
+			<column/>
+		</columns>
+		<rows>
+			<row class="th">
+				<description span="all" value="Description"/>
+			</row>
+			<row class="row" valign="top">
+				<description/>
+				<textbox multiline="true" rows="15" cols="80" no_lang="1" id="info_des" statustext="enter a textual description of the log-entry"/>
+			</row>
+		</rows>
+	</grid>
+	<grid id="infolog.edit.links" template="" lang="" group="0" version="0.9.15.003" width="100%">
+		<columns>
+			<column width="100"/>
+			<column/>
+		</columns>
+		<rows>
+			<row class="th" disabled="@status_only">
+				<description span="all" value="Create new links"/>
+			</row>
+			<row class="row" disabled="@status_only">
+				<link-to span="all" id="link_to"/>
+			</row>
+			<row class="th">
+				<description span="all" value="Existing links"/>
+			</row>
+			<row class="row_off" valign="top" height="164">
+				<link-list span="all" id="link_to"/>
+			</row>
+		</rows>
+	</grid>
+	<grid id="infolog.edit.delegation" template="" lang="" group="0" version="0.9.15.002" width="100%">
+		<columns>
+			<column width="100"/>
+			<column/>
+		</columns>
+		<rows>
+			<row class="th">
+				<description span="all" value="Priority"/>
+			</row>
+			<row class="row">
+				<description value="Priority"/>
+				<menulist>
+					<menupopup id="info_pri" statustext="select a priority for this task"/>
+				</menulist>
+			</row>
+			<row class="th">
+				<description span="all" value="Delegation"/>
+			</row>
+			<row class="row">
+				<description value="Responsible"/>
+				<menulist>
+					<menupopup type="select-account" options="Owner" id="info_responsible" statustext="select a responsible user: a person you want to delegate this task"/>
+				</menulist>
+			</row>
+			<row class="row" disabled="1">
+				<description value="Confirm"/>
+				<menulist>
+					<menupopup id="info_confirm" statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both"/>
+				</menulist>
+			</row>
+			<row class="row" height="120">
+				<description span="all"/>
+			</row>
+		</rows>
+	</grid>
+	<grid id="infolog.edit.customfields" template="" lang="" group="0" version="0.9.15.001" width="100%" height="100%" spacing="0" padding="0">
+		<columns>
+			<column/>
+		</columns>
+		<rows>
+			<row height="100%">
+				<customfields id="customfields"/>
+			</row>
+		</rows>
+	</grid>
+	<grid id="infolog.edit" template="" lang="" group="" version="1.0.0.000" width="100%">
+		<columns>
+			<column width="103"/>
+			<column width="350"/>
+			<column width="50"/>
+			<column/>
+		</columns>
+		<rows>
+			<row class="th">
+				<description value="Type"/>
+				<menulist span="all">
+					<menupopup id="info_type" onchange="1" statustext="Type of the log-entry: Note, Phonecall or ToDo"/>
+				</menulist>
+				<description/>
+				<description/>
+			</row>
+			<row class="row">
+				<description value="Category"/>
+				<menulist span="all">
+					<menupopup type="select-cat" options="None" id="info_cat" statustext="select a category for this entry"/>
+				</menulist>
+				<description/>
+				<description/>
+			</row>
+			<row class="row">
+				<description value="Contact"/>
+				<textbox size="40" maxlength="64" id="info_from" statustext="Custom contact-information, leave emtpy to use information from most recent link" blur="@blur_title"/>
+				<description value="Phone/Email"/>
+				<textbox size="40" maxlength="64" id="info_addr" statustext="Custom contact-address, leave empty to use information from most recent link"/>
+			</row>
+			<row class="row">
+				<description value="Subject"/>
+				<textbox size="64" maxlength="64" span="all" id="info_subject" needed="1" statustext="a short subject for the entry"/>
+			</row>
+			<row valign="top" height="250">
+				<tabbox>
+					<tabs span="all">
+						<tab label="Description" statustext="longer textual description"/>
+						<tab label="Links" statustext="Links of this entry"/>
+						<tab label="Delegation" statustext="responsible user, priority, ..."/>
+						<tab label="Customfields" statustext=""/>
+					</tabs>
+					<tabpanels>
+						<grid id="infolog.edit.description"/>
+						<grid id="infolog.edit.links"/>
+						<grid id="infolog.edit.delegation"/>
+						<grid id="infolog.edit.customfields"/>
+					</tabpanels>
+				</tabbox>
+			</row>
+			<row class="th">
+				<description span="all" value="Dates, Status, Access"/>
+			</row>
+			<row class="row">
+				<description value="Startdate"/>
+				<date-time options=",2" id="info_startdate" statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)"/>
+				<description value="Enddate"/>
+				<date id="info_enddate" statustext="til when should the ToDo or Phonecall be finished"/>
+			</row>
+			<row class="row">
+				<description value="Status"/>
+				<menulist>
+					<menupopup id="info_status" statustext="@status_help"/>
+				</menulist>
+				<description value="Private"/>
+				<checkbox options="private,public" id="info_access" statustext="should this entry only be visible to you and people you grant privat access via the ACL"/>
+			</row>
+			<row class="row">
+				<description value="Owner"/>
+				<menulist>
+					<menupopup type="select-account" id="info_owner" readonly="true"/>
+				</menulist>
+				<description value="Last modified"/>
+				<hbox options="0,0">
+					<menulist>
+						<menupopup type="select-account" id="info_modifier" readonly="true"/>
+					</menulist>
+					<date-time class="lpadding5" id="info_datemodified" readonly="true"/>
+				</hbox>
+			</row>
+			<row>
+				<button label="Save" id="save" statustext="Saves this entry"/>
+				<button label="Cancel" id="cancel" statustext="leave without saveing the entry"/>
+				<description/>
+				<button label="Delete" align="right" id="delete" statustext="delete this entry"/>
+			</row>
+		</rows>
+		<styles>
+			.headertext { color: black; font-size: 120%; }
+.lpadding5 { padding-left: 5px; };
+		</styles>
+	</grid>
+</overlay>
\ No newline at end of file