Well it seems as of Jan 3 I've been switched to JMAP and the adding of the spam score to new incoming spam is no longer prefixed with the score nor is the option available in Spam Protection
I submitted a ticket to ask for an explanation.
As for drafts I tried constructing an email complete with an embedded picture. It did not watermark the draft with the "draft stamp" at least initially. When I went back it plastered it over the headers near the top and it's pretty ugly the way they drew it. I guess I can live with that so long as it's over the headers and not the body.