Merge change I915b13a6 into eclair-mr2

* changes:
  Fix MessageListUnitTests