Fixing up messages on Send