Merge branch '6051-trigger-junk-move-by-subject-line-impacts-forwarded-emails' into 'develop'

Resolve "Trigger junk move by Subject line impacts forwarded emails"

Closes #6051

See merge request !1409