Squashed commit of the following:

commit 2e7b026f5865d84f369288a70d86c44e07e8c3b1
Merge: 08c6691 c476669f
Author: Jim Nelson <jim@yorba.org>
Date:   Wed Jan 16 15:24:35 2013 -0800

    Merge branch 'master' into bug/6099-view-images

commit 08c6691c5c466448710a5b055676778348650b86
Author: Jim Nelson <jim@yorba.org>
Date:   Wed Jan 16 15:06:00 2013 -0800

    Updates in response to Eric's code review

commit 9694e0a4d678b3b0674e9970b8f3b840937955f3
Author: Jim Nelson <jim@yorba.org>
Date:   Wed Jan 16 14:17:12 2013 -0800

    Merge of Andrea Corbellini's patch for #6099

    The merge had to be done by hand because of a recent refactoring of
    the ConversationViewer and ConversationWebView.