Fixing fetchmail problem introduced in recent merge.