diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index ab645b5441..c1ff36b0e6 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -967,8 +967,8 @@ function force_download(_action, _senders)
 			else
 			{
 				$content = $stat;
-				$content['name'] = egw_vfs::basename($path);
-				$content['dir'] = egw_vfs::decodePath(egw_vfs::dirname($path));
+				$content['name'] = $content['itempicker_merge']['name'] = egw_vfs::basename($path);
+				$content['dir'] = $content['itempicker_merge']['dir'] = egw_vfs::decodePath(egw_vfs::dirname($path));
 				$content['path'] = $path;
 				$content['hsize'] = egw_vfs::hsize($stat['size']);
 				$content['mime'] = egw_vfs::mime_content_type($path);
@@ -1223,6 +1223,7 @@ function force_download(_action, _senders)
 				0 => lang('No access'),
 			);
 		}
+		$sel_options['mergeapp']= egw_link::app_list('merge');
 		$preserve = $content;
 		if (!isset($preserve['old']))
 		{
diff --git a/filemanager/templates/default/file.xet b/filemanager/templates/default/file.xet
index d10f7535ab..9a24c589b0 100644
--- a/filemanager/templates/default/file.xet
+++ b/filemanager/templates/default/file.xet
@@ -203,7 +203,46 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="filemanager.file" template="" lang="" group="0" version="1.7.001">
+	<template id="filemanager.file.merge" template="" lang="" group="0" version="1.9.001">
+		<grid width="450" height="300" spacing="10" overflow="auto">
+			<columns>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<hbox>
+						<itempicker id="itempicker_merge" application="calendar,infolog,projectmanager" action="itempickerDocumentAction" action_label="Merge"/>
+					</hbox>
+				</row>
+				<row>
+					<groupbox>
+						<caption label="Merge settings"/>
+						<grid>
+							<columns>
+								<column />
+								<column />
+							</columns>
+							<rows>
+								<row disabled="@is_dir">
+									<description value="Items of the selected application can be inserted into this document"/>
+									<menulist>
+										<menupopup id="merge[mergeapp]"/>
+									</menulist>
+								</row>
+								<row disabled="!@is_dir">
+									<description value="Items of the selected application can be inserted into files of this directory"/>
+									<menulist>
+										<menupopup id="merge[mergeapp]"/>
+									</menulist>
+								</row>
+							</rows>
+						</grid>
+					</groupbox>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="filemanager.file" template="" lang="" group="0" version="1.9.001">
 		<grid>
 			<columns>
 				<column/>
@@ -220,6 +259,7 @@
 							<tab id="filemanager.file.eacl" label="Extended ACL"/>
 							<tab id="filemanager.file.preview" label="Preview"/>
 							<tab id="filemanager.file.custom" label="Custom fields"/>
+							<tab id="filemanager.file.merge" label="Merge"/>
 						</tabs>
 						<tabpanels>
 							<template id="filemanager.file.general"/>
@@ -227,6 +267,7 @@
 							<template id="filemanager.file.eacl"/>
 							<template id="filemanager.file.preview"/>
 							<template id="filemanager.file.custom"/>
+							<template id="filemanager.file.merge"/>
 						</tabpanels>
 					</tabbox>
 				</row>