Now not waiting mail till very end.