Index: Copyright.txt
===================================================================
--- Copyright.txt	(revision 20836)
+++ Copyright.txt	(working copy)
@@ -3,6 +3,7 @@
 
 Adam Atlas
 Colin Barrett
+Reid Barton
 Erik J. Barzeski
 Max Bertrand
 Adam Betts
Index: Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m
===================================================================
--- Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m	(revision 20836)
+++ Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m	(working copy)
@@ -297,10 +297,15 @@
     //Create & set the new overlay state
     if ([overlayObjectsArray count] != 0) {
         //Set the state
-        overlayState = [[AIIconState alloc] initWithImages:[NSArray arrayWithObjects:[self overlayImageFlash:NO], [self overlayImageFlash:YES], nil]
-													 delay:0.5
-												   looping:YES 
-												   overlay:YES];
+		if ([[[[adium preferenceController] preferencesForGroup:PREF_GROUP_APPEARANCE] objectForKey:KEY_ANIMATE_DOCK_ICON] boolValue]) {
+			overlayState = [[AIIconState alloc] initWithImages:[NSArray arrayWithObjects:[self overlayImageFlash:NO], [self overlayImageFlash:YES], nil]
+														 delay:0.5
+												       looping:YES 
+													   overlay:YES];
+		} else {
+			overlayState = [[AIIconState alloc] initWithImage:[self overlayImageFlash:NO]
+													  overlay:YES];
+		}
         [[adium dockController] setIconState:overlayState named:@"ContactStatusOverlay"];
     }   
 }