BZ1028459 - Inbox: 'Open' button doesn't work. Fix merge conflicts.. looks like someone applied a change to 6.0.x but not master