diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index ebeceb4a86..a723aa10ae 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -278,6 +278,18 @@ class mail_compose
 			unset($actions['save2vfs']);
 			unset($actions['selectFromVFSForCompose']);
 		}
+		if (!isset($GLOBALS['egw_info']['user']['apps']['infolog']))
+		{
+			unset($actions['to_infolog']);
+		}
+		if (!isset($GLOBALS['egw_info']['user']['apps']['tracker']))
+		{
+			unset($actions['to_tracker']);
+		}
+		if (!isset($GLOBALS['egw_info']['user']['apps']['calendar']))
+		{
+			unset($actions['to_calendar']);
+		}
 		return $actions;
 	}
 
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 6988b7d14b..b34eccdb16 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -615,7 +615,7 @@ class mail_ui
 		}
 		// send configured image proxy to client-side
 		$content['image_proxy'] = self::image_proxy();
-
+		$content['no_vfs'] = !$GLOBALS['egw_info']['user']['apps']['filemanager'];
 		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
 
@@ -2570,6 +2570,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 				{
 					$attachmentHTML[$key]['classSaveAllPossiblyDisabled'] = "";
 				}
+				if (!$GLOBALS['egw_info']['user']['apps']['filemanager']) $attachmentHTML[$key]['no_vfs'] = true;
 			}
 			$attachmentHTMLBlock="<table width='100%'>";
 			foreach ((array)$attachmentHTML as $row)
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 54821f79cf..ea2d55f700 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -81,8 +81,8 @@
 								<description class="useEllipsis et2_link" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]" />
 								<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})" label="Save to disk"/>
-								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
-								<buttononly  class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" label="Save all attachments to filemanager"/>
+								<buttononly id="${row}[saveAsVFS]" disabled="$row_cont[no_vfs]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
+								<buttononly  class="$row_cont[classSaveAllPossiblyDisabled]" disabled="$row_cont[no_vfs]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" label="Save all attachments to filemanager"/>
 								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
 							</row>
 						</rows>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index f103f5ccd0..1bea9571c0 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -65,8 +65,8 @@
 								<description class="et2_link useEllipsis" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]"/>
 								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})" label="Save to disk"/>
-								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
-								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" label="Save all attachments to filemanager"/>
+								<buttononly id="${row}[saveAsVFS]" disabled="$row_cont[no_vfs]" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
+								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" disabled="$row_cont[no_vfs]" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" label="Save all attachments to filemanager"/>
 								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
 							</row>
 						</rows>