Bug 1079824 - [Messages] Draft saved from activity is duplicated

Ya I agree we should refactoring this in better way. My rough idea is simply doing this while back(or AfterLeave) and Close. It seems not that necessary to reset at the beginning(if we already clean up properly while leaving)