Also attach comments to attachments when appropriate and display alongside - fixes issue:38