Bug 1112036 - Implement fallback mechanism for conversations
Merge pull request #413 from crdlc/bug-1112036

Bug 1112036 - Implement fallback mechanism for conversations