Fixed automatic doShift for mail and pithod(pandora).
Minor formatting change.