Bug #712738 - Recovered message doesn't restore options