Urgent mail problem fix