Merge "Properly show conversation settings"