Merge pull request #634 from wagnerand/2.4+

Fix for https://github.com/protz/GMail-Conversation-View/issues/632