Fixing up message sender