Update message receive logic