add mail and w3m fixes