Minor changes to prepare messages storage (not yet implemented)