use one subject so messages are in one thread
merge whitespace and subject fixes