Updated resister issue
Updated mail wrapper