r2091 + restore more lost messages