Issue #126: Sort by From/To ... doesn't work fixed
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #127 from Bohdan-Tereta/development

Issue #126 fixed