messaging beefed up to include swps in mail body!