Merge branch 'master' into develop

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.5.2'
+__version__ = '8.5.3'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/email/queue.py

@@ -495,6 +495,7 @@ def prepare_message(email, recipient, recipients_list):
 			'fcontent': fcontent,
 			'parent': msg_obj
 		})
+		attachment.pop("fid", None)
 		add_attachment(**attachment)
 
 	return msg_obj.as_string()