Update message to 'for sending'
Merged conflicts