Followed up on message timestamp locking
Followed up on message timestamp locking

ExC0d3/Hilary,ExC0d3/Hilary,nicolaasmatthijs/Hilary,jfederico/Hilary,jfederico/Hilary,simong/Hilary,stuartf/Hilary,Orodan/Hilary,timdegroote/Hilary,nicolaasmatthijs/Hilary,Orodan/Hilary,timdegroote/Hilary,mrvisser/Hilary,stuartf/Hilary,mrvisser/Hilary,simong/Hilary