Added mailtool and regex.  Disabled none working patches for now