Merge pull request #4 from honestbleeps/master

Pull from upstream
Merge pull request #5 from honestbleeps/master

Pull from upstream
Make expando icons show up after links in messages.
Merge pull request #1681 from erikdesjardins/master

Fix expando icons showing up before links in messages