fixed email commands