fix selected transport display bug - fixes #591
fix test suite
Merge branch 'hotfix-email-selected-transport' into develop