Reliable fix

NOTE: The changing of the order of senders in Message