[ns.router] Частиный рерайт
Merge remote-tracking branch 'origin/issue-441' into unquiet-mail