mail based bug fixed