fixes for stored messages v.1.0