configurable header names and added ehlo header