Making the mail page less clicks and more reliable