added mail-server and arrow button