BAG: fixed smtp-server delovery date bag
Merge branch 'development' of github.com:engagepoint/labs-test-message-server into development