Mail archive back in shape