Improved security in the message model