Instant Mail UI
Refactoring