Revert "Add default 3 second timeout to mail"

This reverts commit 3ac76ed200e5b3d205b192444ee0b3aef67305f1.