Cleaned up update_task an mail namespace issue