am e3a9b86c: am 5163798d: Fix conversation loading
am e3a9b86c: am 5163798d: Fix conversation loading

Merge commit 'e3a9b86c698e04f0c9ac278a18f359fca31319f7'

* commit 'e3a9b86c698e04f0c9ac278a18f359fca31319f7':
  Fix conversation loading

bmaupin/android-sms-plus