Fixed Issue #2239

Fix for issue #2239 where subject would be reset when using ``bcc_batch_mode`` which would also trigger a warning.