diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index acb0a83b0a..718f21fe4c 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -48,6 +48,12 @@ class addressbook_merge extends bo_merge
 		{
 			return false;
 		}
+		// Links
+		$replacements += array(
+			'$$links$$'		=> $this->get_links('addressbook', $id, '!'.egw_link::VFS_APPNAME),
+			'$$attachments$$'	=> $this->get_links('addressbook', $id, egw_link::VFS_APPNAME),
+			'$$links_attachments$$'	=> $this->get_links('addressbook', $id)
+		);
 		if (!(strpos($content,'$$calendar/') === false))
 		{
 			$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
@@ -173,6 +179,9 @@ class addressbook_merge extends bo_merge
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
 		foreach(array(
+			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
+ 			'attachments' => lang('List of files linked to the current record'),
+			'links_attachments' => lang('Links and attached files'),
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),
diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php
index 275f68f16e..08ad5626ca 100644
--- a/calendar/inc/class.calendar_merge.inc.php
+++ b/calendar/inc/class.calendar_merge.inc.php
@@ -207,6 +207,12 @@ class calendar_merge extends bo_merge
 		{
 			$replacements['$$'.($prefix?$prefix.'/':'').'#'.$name.'$$'] = $event['#'.$name];
 		}
+
+		// Links
+		$replacements['$$'.($prefix?$prefix.'/':'').'links$$'] = $this->get_links('calendar', $event['id'], '!'.egw_link::VFS_APPNAME);
+ 		$replacements['$$'.($prefix?$prefix.'/':'').'attachments$$'] = $this->get_links('calendar', $event['id'], egw_link::VFS_APPNAME);
+		$replacements['$$'.($prefix?$prefix.'/':'').'links_attachments$$'] = $this->get_links('calendar', $event['id']);
+
 		return $replacements;
 	}
 
@@ -563,6 +569,9 @@ class calendar_merge extends bo_merge
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
 		foreach(array(
+			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
+			'attachments' => lang('List of files linked to the current record'),
+			'links_attachments' => lang('Links and attached files'),
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),
diff --git a/timesheet/inc/class.timesheet_merge.inc.php b/timesheet/inc/class.timesheet_merge.inc.php
index a78398fe2b..ad0b280825 100644
--- a/timesheet/inc/class.timesheet_merge.inc.php
+++ b/timesheet/inc/class.timesheet_merge.inc.php
@@ -124,6 +124,11 @@ class timesheet_merge extends bo_merge
 			if(!$array['#'.$name]) $array['#'.$name] = '';
 		}
 
+		// Links
+		$array['links'] = $this->get_links('timesheet', $id, '!'.egw_link::VFS_APPNAME);
+ 		$array['attachments'] = $this->get_links('timesheet', $id, egw_link::VFS_APPNAME);
+		$array['links_attachments'] = $this->get_links('timesheet', $id);
+
 		// Add markers
 		foreach($array as $key => &$value)
 		{
@@ -182,6 +187,9 @@ class timesheet_merge extends bo_merge
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
 		foreach(array(
+			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
+ 			'attachments' => lang('List of files linked to the current record'),
+			'links_attachments' => lang('Links and attached files'),
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),