Index: bp-themes/bp-default/_inc/css/default.css
===================================================================
--- bp-themes/bp-default/_inc/css/default.css	(revision 4804)
+++ bp-themes/bp-default/_inc/css/default.css	(working copy)
@@ -1540,6 +1540,12 @@ div#message.updated p {
 	padding: 6px;
 	width: 90%;
 }
+input[type="submit"].pending,
+input[type="button"].pending,
+input[type="reset"].pending,
+input[type="submit"].disabled,
+input[type="button"].disabled,
+input[type="reset"].disabled,
 button.pending,
 button.disabled,
 div.pending a,
@@ -1548,6 +1554,12 @@ a.disabled {
 	color: #bbb;
 	cursor: default;
 }
+input[type="submit"]:hover.pending,
+input[type="button"]:hover.pending,
+input[type="reset"]:hover.pending,
+input[type="submit"]:hover.disabled,
+input[type="button"]:hover.disabled,
+input[type="reset"]:hover.disabled,
 button.pending:hover,
 button.disabled:hover,
 div.pending a:hover,
Index: bp-themes/bp-default/_inc/global.js
===================================================================
--- bp-themes/bp-default/_inc/global.js	(revision 4804)
+++ bp-themes/bp-default/_inc/global.js	(working copy)
@@ -110,7 +110,8 @@ jq(document).ready( function() {
 				jq("textarea#whats-new").val('');
 
 				/* Re-enable the submit button after 8 seconds. */
-				setTimeout( function() { button.prop("disabled", false); }, 8000 );
+				button.addClass('disabled');
+				setTimeout( function() { button.prop("disabled", false); button.removeClass('disabled'); }, 8000 );
 			}
 		});
 
@@ -399,7 +400,8 @@ jq(document).ready( function() {
 					jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
 
 					/* Re-enable the submit button after 5 seconds. */
-					setTimeout( function() { target.prop("disabled", false); }, 5000 );
+					target.addClass('disabled');
+					setTimeout( function() { target.prop("disabled", false).removeClass('disabled'); }, 5000 );
 				}
 			});