Some refactoring on the Message List focused/selection preservation
Some refactorings on #140 and #173 fixes