diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 22245ea..d849e45 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -128,6 +128,8 @@ static void	handle_multipart_signed		(EMsgComposer *composer,
 
 static void	e_msg_composer_alert_sink_init	(EAlertSinkInterface *interface);
 
+gboolean 	check_blacklisted_file		(gchar *filename);
+
 G_DEFINE_TYPE_WITH_CODE (
 	EMsgComposer,
 	e_msg_composer,
@@ -3999,6 +4001,22 @@ merge_always_cc_and_bcc (EComposerHeaderTable *table,
 	e_destination_freev (addrv);
 }
 
+static const gchar *blacklisted_files [] = {"/etc/", ".", ".."};
+
+gboolean check_blacklisted_file (gchar *filename)
+{
+	gboolean blacklisted = FALSE;
+	gint i;
+
+	for(i = 0; !blacklisted && i < G_N_ELEMENTS(blacklisted_files); i++)
+	{
+		if(g_strstr_len(filename, -1, blacklisted_files[i]))
+			blacklisted = TRUE;
+	}
+	
+	return blacklisted;
+}
+
 static void
 handle_mailto (EMsgComposer *composer,
                const gchar *mailto)
@@ -4090,8 +4108,14 @@ handle_mailto (EMsgComposer *composer,
 			} else if (!g_ascii_strcasecmp (header, "attach") ||
 				   !g_ascii_strcasecmp (header, "attachment")) {
 				EAttachment *attachment;
+				gboolean check = FALSE;
 
 				camel_url_decode (content);
+				check = check_blacklisted_file(content);
+				if(check)
+					e_alert_submit (
+		                        	E_ALERT_SINK (composer),
+                			        "mail:blacklisted-file", content, NULL);
 				if (g_ascii_strncasecmp (content, "file:", 5) == 0)
 					attachment = e_attachment_new_for_uri (content);
 				else
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index f32b4ce..c63a605 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -540,5 +540,10 @@ An mbox account will be created to preserve the old mbox folders. You can delete
     <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
   </error>
 
+  <error id="blacklisted-file" type="warning">
+    <_primary>Mailto command is trying to attach Blacklisted File.</_primary>
+    <_secondary xml:space="preserve">The attachment named {0} is a hidden file and may contain sensitive data.</_secondary>
+  </error>
+
 </error-list>
 
