diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index 28885f40a4..afb9ed5fc3 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -386,6 +386,7 @@ class Email:
 			fname = part.get_filename()
 			if fname:
 				try:
+					fname = fname.replace('\n', ' ').replace('\r', '')
 					fname = cstr(decode_header(fname)[0][0])
 				except:
 					fname = get_random_filename(content_type=content_type)