Tweak wording of EVI and add a method to determine if a message should be forwarded