Fixed mail content , dependency , remove priority queue identifier