changed to new mail
updated to new vim structure