Merge "Fix up conversation menu items."