Fixed initial msg/file saving & final restoration