Changing the access pattern for emails for handling some edge cases