bugfix-r5 set emails to be queued
Merge branch 'bugfix-r5' into develop