improved plugin added mail