smtp fixes v0

- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/53
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/53