Tweak BODY_SINGLE_WORD and FILL_THIS_FORM_LONG

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1547863 13f79535-47bb-0310-9956-ffa450edef68