add relay to static method
Merge branch 'sup-for-two' into maildir-root