diff --git a/etemplate/lang/egw_en.lang b/etemplate/lang/egw_en.lang
index 222cc17fea..86e98b0647 100644
--- a/etemplate/lang/egw_en.lang
+++ b/etemplate/lang/egw_en.lang
@@ -250,6 +250,7 @@ link	etemplate	en	Link
 linkapps	etemplate	en	Link apps
 linkentry	etemplate	en	Link entry
 linklist	etemplate	en	Link list
+links and attached files	preferences	en	Links and attached files
 linkstring	etemplate	en	Link string
 linkto	etemplate	en	Link to
 list of files linked to the current record	preferences	en	List of files linked to the current record
@@ -406,7 +407,7 @@ the document can contain placeholder like {{%3}}, to be replaced with the data (
 the following document-types are supported:	preferences	en	The following document types are supported:
 this text gets displayed if the input-field is empty and has no focus (blur)	etemplate	en	Text gets displayed if the input field is empty and has no focus (blur)
 time	etemplate	en	Time
-titles of any entries linked to the current record	preferences	en	Titles of any entries linked to the current record
+titles of any entries linked to the current record, excluding attached files	preferences	en	Titles of any entries linked to the current record, excluding attached files
 to disable: [! = not]<value>[=<check>] eg: '!@data' disables if content of data is empty	etemplate	en	To disable: [! = not]<value>[=<check>] eg: '!@data' disables if content of data is empty
 to start the db-tools	etemplate	en	To start DB tools
 to start the etemplate editor	etemplate	en	To start eTemplate editor
diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php
index cc932240ad..1cc45be440 100644
--- a/infolog/inc/class.infolog_merge.inc.php
+++ b/infolog/inc/class.infolog_merge.inc.php
@@ -110,8 +110,9 @@ class infolog_merge extends bo_merge
 		}
 
 		// Links
-		$array['links'] = $this->get_links('infolog', $id);
+		$array['links'] = $this->get_links('infolog', $id, '!'.egw_link::VFS_APPNAME);
 		$array['attachments'] = $this->get_links('infolog', $id, egw_link::VFS_APPNAME);
+		$array['links_attachments'] = $this->get_links('infolog', $id);
 
 		// Add markers
 		foreach($array as $key => &$value)
@@ -185,8 +186,9 @@ class infolog_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'),
+			'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'),