Reduces message cloning overhead for single recipients: closes #417
Updated tests