diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang
index ac92311731..1baf6d6451 100644
--- a/admin/lang/egw_en.lang
+++ b/admin/lang/egw_en.lang
@@ -697,6 +697,8 @@ php version	admin	en	PHP version
 phpinfo	admin	en	PHP information
 phrase	admin	en	Phrase
 phrase deleted	admin	en	Phrase deleted
+please check email.  it gets automatically deleted if email integration is used.	admin	en	Please check email.  It gets automatically deleted if email integration is used.
+please check home folder.  all files and folders of the user will be unusable by other users.	admin	en	Please check home folder.  All files and folders of the user will be unusable by other users.
 please enter a name	admin	en	Enter a name
 please enter a name for that server !	admin	en	Enter a name for that server!
 please run setup to become current	admin	en	Run setup to become current
diff --git a/admin/templates/default/account.delete.xet b/admin/templates/default/account.delete.xet
index 7a19822332..27b1b50405 100644
--- a/admin/templates/default/account.delete.xet
+++ b/admin/templates/default/account.delete.xet
@@ -36,6 +36,22 @@
 					</row>
 				</rows>
 			</grid>
+			<grid>
+				<columns>
+					<column width="150"/>
+					<column/>
+				</columns>
+				<rows>
+					<row>
+						<select-app value="filemanager" readonly="true"/>
+						<description value="Please check home folder.  All files and folders of the user will be unusable by other users."/>
+					</row>
+					<row>
+						<select-app value="mail" readonly="true"/>
+						<description value="Please check email.  It gets automatically deleted if email integration is used."/>
+					</row>
+				</rows>
+			</grid>
 			<description value="If you delete the user without selecting an account to move the data to, all entries get deleted!"/>
 		</vbox>
 	</template>