#27 & #28, fixed account and envelope deletion