1.1 --- a/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m	Tue Mar 16 06:35:39 2010 -0400
     1.2 +++ b/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m	Tue Mar 16 22:14:34 2010 -0400
     1.3 @@ -337,8 +337,9 @@
     1.4  - (void)configureControlDimming
     1.5  {	
     1.6  	// Controls are enabled if we're the regular chat tab, or we're not using regular preferences.
     1.7 -	BOOL anyControlsEnabled = (self.currentTab == AIWebkitRegularChat || ![[adium.preferenceController preferenceForKey:KEY_WEBKIT_USE_REGULAR_PREFERENCES
     1.8 -																			group:self.preferenceGroupForCurrentTab] boolValue]);
     1.9 +	BOOL useRegularPreferences = [[adium.preferenceController preferenceForKey:KEY_WEBKIT_USE_REGULAR_PREFERENCES
    1.10 +																		 group:PREF_GROUP_WEBKIT_GROUP_MESSAGE_DISPLAY] boolValue];
    1.11 +	BOOL anyControlsEnabled = (self.currentTab == AIWebkitRegularChat || !useRegularPreferences);
    1.12  	
    1.13  	// General controls with no other qualifiers.
    1.14  	[popUp_styles setEnabled:anyControlsEnabled];
    1.15 @@ -366,7 +367,7 @@
    1.16  	if (self.currentTab == AIWebkitGroupChat)
    1.17  		[checkBox_showHeader setEnabled:[messageStyle hasTopic] && anyControlsEnabled];
    1.18  	else
    1.19 -		[checkBox_showHeader setEnabled:[messageStyle hasHeader] && anyControlsEnabled];
    1.20 +		[checkBox_showHeader setEnabled:[messageStyle hasHeader] || ([messageStyle hasTopic] && useRegularPreferences)];
    1.21  	
    1.22  	//Disable user icon toggling if the style doesn't support them
    1.23  	[checkBox_showUserIcons setEnabled:[messageStyle allowsUserIcons] && anyControlsEnabled];