diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index a07a17d..2117d9a 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -140,6 +140,7 @@ static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart,
 static void handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, gint depth);
 static void handle_multipart_encrypted (EMsgComposer *composer, CamelMimePart *multipart, gint depth);
 static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, gint depth);
+gboolean check_blacklisted_file (gchar *filename);
 
 static EDestination**
 destination_list_to_vector_sized (GList *list, gint n)
@@ -3096,6 +3097,22 @@ add_recipients (GList *list, const gchar *recips)
 	return list;
 }
 
+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)
 {
@@ -3187,6 +3204,11 @@ handle_mailto (EMsgComposer *composer, const gchar *mailto)
 				EAttachment *attachment;
 
 				camel_url_decode (content);
+				if(check_blacklisted_file(content))
+				{
+					g_warning("Mailto command is trying to attach blacklisted file: %s. The attachment may contain sensitive data. Kindly review it", content);
+					break;
+				}
 				if (g_ascii_strncasecmp (content, "file:", 5) == 0)
 					attachment = e_attachment_new_for_uri (content);
 				else
