From 80f0f2b99774b570d998109d565aecf46df5c06c Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 24 Sep 2010 21:50:32 -0400
Subject: [PATCH] Revert "Removed the "fix_scrollbarbug" div and all references
 to it."

This reverts commit 85b8087bf603edb5320f0bc9da18ed2294204ca2.
---
 webcit/auth.c                                 |  5 ++--
 webcit/bbsview_renderer.c                     |  3 ++
 webcit/blogview_renderer.c                    |  3 ++
 webcit/calendar_view.c                        | 20 ++++++++-----
 webcit/event.c                                |  4 +++
 webcit/openid.c                               |  3 ++
 webcit/paging.c                               |  5 ++--
 webcit/setup_wizard.c                         |  6 ++--
 webcit/sieve.c                                | 10 ++++---
 webcit/smtpqueue.c                            |  5 ++--
 webcit/static/styles/content.css              |  5 ++++
 webcit/static/styles/webcit.css               |  5 ++++
 webcit/static/t/aide/display_generic_cmd.html |  2 ++
 webcit/static/t/aide/display_inetconf.html    |  1 +
 webcit/static/t/aide/display_menu.html        |  3 +-
 .../static/t/aide/display_serverrestart.html  |  8 +++--
 .../t/aide/display_serverrestart_page_do.html |  8 +++--
 .../t/aide/display_sitewide_config.html       |  2 ++
 webcit/static/t/aide/edituser/detailview.html |  3 +-
 webcit/static/t/aide/edituser/select.html     |  2 ++
 webcit/static/t/display_main_menu.html        |  2 ++
 webcit/static/t/display_message.html          |  2 +-
 webcit/static/t/edit_message.html             |  2 +-
 webcit/static/t/files.html                    |  2 ++
 webcit/static/t/files/picview.js              |  2 ++
 webcit/static/t/floors.html                   |  3 +-
 webcit/static/t/iconbar/edit.html             |  3 +-
 webcit/static/t/knrooms.html                  |  4 +++
 webcit/static/t/room/create.html              |  4 +++
 webcit/static/t/room/display_private.html     |  2 +-
 webcit/static/t/room/edit.html                |  2 ++
 webcit/static/t/room/edit/editroom.html       | 30 +++++++++++--------
 webcit/static/t/room/zapped_list.html         |  2 +-
 webcit/static/t/summary_trailer.html          |  4 +--
 webcit/static/t/view_message.html             |  2 +-
 webcit/static/t/view_message/print.html       |  2 +-
 webcit/static/t/who.html                      |  2 +-
 webcit/tasks.c                                |  6 ++--
 webcit/userlist.c                             | 10 ++++---
 webcit/vcard_edit.c                           |  3 +-
 webcit/wiki.c                                 |  9 ++++--
 41 files changed, 141 insertions(+), 60 deletions(-)

diff --git a/webcit/auth.c b/webcit/auth.c
index 80f7ddbb0..cb2917b67 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -645,7 +645,8 @@ void validate(void)
 		return;
 	}
 
-	wc_printf("<table class=\"auth_validate\"><tr><td>\n");
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"auth_validate\"><tr><td>\n");
 	wc_printf("<div id=\"validate\">");
 
 	safestrncpy(user, &buf[4], sizeof user);
@@ -728,7 +729,7 @@ void validate(void)
 	wc_printf("<br />\n");
 
 	wc_printf("</div>\n");
-	wc_printf("</td></tr></table>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c
index a4b707841..3472b99d8 100644
--- a/webcit/bbsview_renderer.c
+++ b/webcit/bbsview_renderer.c
@@ -180,6 +180,8 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 	int start_index = 0;
 	int end_index = 0;
 
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
+
 	if (Stat->nummsgs > 0) {
 		lprintf(9, "sorting %d messages\n", BBS->num_msgs);
 		qsort(BBS->msgs, (size_t)(BBS->num_msgs), sizeof(long), bbsview_sortfunc);
@@ -351,6 +353,7 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 		}
 	}
 
+	wc_printf("</div>\n");
 	return(0);
 }
 
diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index dc376b665..760045e95 100644
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -111,6 +111,8 @@ int blogview_render(SharedMessageStatus *Stat,
 	struct blogview *BLOG = (struct blogview *) *ViewSpecific;
 	int i;
 
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
+
 	if (Stat->nummsgs > 0) {
 		lprintf(9, "sorting %d messages\n", BLOG->num_msgs);
 		qsort(BLOG->msgs, (size_t)(BLOG->num_msgs), sizeof(long), blogview_sortfunc);
@@ -134,6 +136,7 @@ int blogview_render(SharedMessageStatus *Stat,
 		}
 	}
 
+	wc_printf("</div>\n");
 	return(0);
 }
 
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index f71c375f8..c40b5a064 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -569,7 +569,8 @@ void calendar_month_view(int year, int month, int day) {
 	}
 
 	/* Outer table (to get the background color) */
-	wc_printf("<table class=\"calendar\"> \n <tr><td>"); 
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"calendar\"> \n <tr><td>"); 
 
 	wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n");
 
@@ -661,8 +662,8 @@ void calendar_month_view(int year, int month, int day) {
 	}
 
 	wc_printf("</table>"			/* end of inner table */
-		"</td></tr></table>\n"		/* end of outer table */
-	);
+		"</td></tr></table>"		/* end of outer table */
+		"</div>\n");
 }
 
 /*
@@ -704,7 +705,8 @@ void calendar_brief_month_view(int year, int month, int day) {
 	}
 
 	/* Outer table (to get the background color) */
-	wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" "
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" "
 		"bgcolor=#204B78><tr><td>\n");
 
 	wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n");
@@ -783,8 +785,8 @@ void calendar_brief_month_view(int year, int month, int day) {
 	}
 
 	wc_printf("</table>"			/* end of inner table */
-		"</td></tr></table>\n"		/* end of outer table */
-	);
+		"</td></tr></table>"		/* end of outer table */
+		"</div>\n");
 }
 
 /*
@@ -1161,6 +1163,8 @@ void calendar_day_view(int year, int month, int day) {
 	++tomorrow.day;
 	tomorrow = icaltime_normalize(tomorrow);
 
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
+
 	/* Inner table (the real one) */
 	wc_printf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
 
@@ -1324,7 +1328,9 @@ void calendar_day_view(int year, int month, int day) {
 	embeddable_mini_calendar(year, month);
 
 	wc_printf("</td></tr>");			/* end stuff-on-the-right */
-	wc_printf("</table>\n");			/* end of inner table */
+
+	wc_printf("</table>"			/* end of inner table */
+		"</div>");
 }
 
 
diff --git a/webcit/event.c b/webcit/event.c
index 56cee1e07..6106ec1db 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -171,6 +171,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
 	wc_printf("<div id=\"content\" class=\"service\">\n");
 
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
+
 	/************************************************************
 	 * Uncomment this to see the UID in calendar events for debugging
 	wc_printf("UID == ");
@@ -770,6 +772,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	end_tab(3, 3);
 	wc_printf("</form>\n");
 
+	wc_printf("</div>\n");			/* end 'fix_scrollbar_bug' div */
+
 	StrBufAppendPrintf(WC->trailing_javascript,
 		"eventEditAllDay();		\n"
 		"RecurrenceShowHide();		\n"
diff --git a/webcit/openid.c b/webcit/openid.c
index efe4280ca..8842e8810 100644
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -13,6 +13,8 @@ void display_openids(void)
 
 	output_headers(1, 1, 1, 0, 0, 0);
 
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
+
 	do_template("beginbox_1", NULL);
 	StrBufAppendBufPlain(WCC->WBuf, _("Manage Account/OpenID Associations"), -1, 0);
 	do_template("beginbox_2", NULL);
@@ -52,6 +54,7 @@ void display_openids(void)
 	}
 
 	do_template("endbox", NULL);
+	wc_printf("</div>");
 	wDumpContent(2);
 }
 
diff --git a/webcit/paging.c b/webcit/paging.c
index 7c632fb9f..307e225a2 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -38,7 +38,8 @@ void display_page(void)
 
 	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wc_printf("<table class=\"paging_background\"><tr><td>\n");
+        wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"paging_background\"><tr><td>\n");
 
 	wc_printf(_("Send an instant message to: "));
 	escputs(recp);
@@ -66,7 +67,7 @@ void display_page(void)
 	wc_printf("<br /><a href=\"javascript:window.close();\"%s</A>\n", _("Cancel"));
 
 	wc_printf("</FORM></CENTER>\n");
-	wc_printf("</td></tr></table>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index 62dafbca1..6ad0cc2e9 100644
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -30,7 +30,9 @@ void do_setup_wizard(void)
 
 	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wc_printf("<form method=\"post\" action=\"setup_wizard\">\n");
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<form method=\"post\" action=\"setup_wizard\">\n"
+	);
 	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
 	wc_printf("<div align=center>"
@@ -41,7 +43,7 @@ void do_setup_wizard(void)
 	wc_printf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Next\">\n");
 	wc_printf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Finish\">\n");
 
-	wc_printf("</form></div>\n");
+	wc_printf("</form></div></div>\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/sieve.c b/webcit/sieve.c
index 40af7f54d..ae08f608a 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -21,13 +21,14 @@ void display_no_sieve(void) {
 
 	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wc_printf("<table class=\"sieve_background\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"sieve_background\">"
 		"<tr><td valign=top>\n");
 
 	wc_printf(_("This installation of Citadel was built without support for server-side mail filtering."
 		"<br>Please contact your system administrator if you require this feature.<br>"));
 
-	wc_printf("</td></tr></table>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
@@ -105,7 +106,8 @@ void display_sieve(void)
 
 	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wc_printf("<table class=\"sieve_background\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"sieve_background\">"
 		"<tr><td valign=top>\n");
 
 
@@ -203,7 +205,7 @@ void display_sieve(void)
 	wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
 	wc_printf("</div></form>\n");
 
-	wc_printf("</td></tr></table>\n");
+	wc_printf("</td></tr></table></div>\n");
 
 	wc_printf("<script type=\"text/javascript\">	\n"
 		"ToggleSievePanels();			\n"
diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index b120ee17a..c73e9a256 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -239,7 +239,8 @@ void display_smtpqueue(void)
 
 	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wc_printf("<table class=\"smtpqueue_background\">"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"smtpqueue_background\">"
 		"<tr><td valign=top>\n");
 
 	wc_printf("<div id=\"smtpqueue_inner_div\">"
@@ -248,7 +249,7 @@ void display_smtpqueue(void)
 		"<div align=\"center\">"
 		"<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"
 		"</div>"
-		"</td></tr></table>\n", _("Refresh this page")
+		"</td></tr></table></div>\n", _("Refresh this page")
 	);
 
 	StrBufAppendPrintf(WC->trailing_javascript, "RefreshSMTPqueueDisplay();\n");
diff --git a/webcit/static/styles/content.css b/webcit/static/styles/content.css
index 533a2eabc..3397ce139 100644
--- a/webcit/static/styles/content.css
+++ b/webcit/static/styles/content.css
@@ -10,6 +10,11 @@
 	overflow-y: auto;                               
 }
 
+.fix_scrollbar_bug {
+	margin-right: 1px;              /* Gecko and other non-broken browsers */
+	font-size: 90%;                 /* Most stuff needs to be a little smaller than normal. */
+}
+
 .boxcontent table {
 	margin: 0;
 	padding: 0;
diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index 61b2e97fa..a7d523773 100644
--- a/webcit/static/styles/webcit.css
+++ b/webcit/static/styles/webcit.css
@@ -497,6 +497,11 @@ body {
 
 #preview_pane { overflow: auto }
 
+.fix_scrollbar_bug {
+	margin-right: 1px;		/* Gecko and other non-broken browsers */
+	font-size: 90%;			/* Most stuff needs to be a little smaller than normal. */
+}
+
 .ctdlTemplate { display: none }
 
 #ctdlContextMenu {
diff --git a/webcit/static/t/aide/display_generic_cmd.html b/webcit/static/t/aide/display_generic_cmd.html
index 5b3761743..fc3552e81 100644
--- a/webcit/static/t/aide/display_generic_cmd.html
+++ b/webcit/static/t/aide/display_generic_cmd.html
@@ -6,6 +6,7 @@
 </div>
 
 <div id="content" class="service">
+  <div class="fix_scrollbar_bug">
     <??("COND:AIDE", 1)>
     <table class="mainmenu_background"><tr><td>
 
@@ -27,4 +28,5 @@
       </tr>
     </table>
     <??("X", 1)>
+  </div>
 <?=("trailing")>
diff --git a/webcit/static/t/aide/display_inetconf.html b/webcit/static/t/aide/display_inetconf.html
index ef71040db..2f6e3621e 100644
--- a/webcit/static/t/aide/display_inetconf.html
+++ b/webcit/static/t/aide/display_inetconf.html
@@ -7,6 +7,7 @@
 </h1>
 </div>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <table border=0 width=100% cellspacing="10" cellpadding="10"> <tr><td valign=top width="50%">
 
 
diff --git a/webcit/static/t/aide/display_menu.html b/webcit/static/t/aide/display_menu.html
index 7c03b144f..1714ce63a 100644
--- a/webcit/static/t/aide/display_menu.html
+++ b/webcit/static/t/aide/display_menu.html
@@ -7,6 +7,7 @@
 </h1>
 </div>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <table>
 <tr valign=top><td width=50% valign="top">
 <??("COND:AIDE", 3)><?DOBOXED("aide_global_config", _("Global Configuration"))><??("X", 3)>
@@ -16,5 +17,5 @@
 <??("COND:AIDE", 4)><?DOBOXED("aide_restart", _("Shutdown Citadel"))><??("X", 3)>
 </td><td width=50% valign="top">
 <?DOBOXED("aide_floorconfig", _("Rooms and Floors"))>
-</td></tr></table>
+</td></tr></table></div>
 <?=("trailing")>
diff --git a/webcit/static/t/aide/display_serverrestart.html b/webcit/static/t/aide/display_serverrestart.html
index f3a6aa1e4..efac86ef8 100644
--- a/webcit/static/t/aide/display_serverrestart.html
+++ b/webcit/static/t/aide/display_serverrestart.html
@@ -23,8 +23,10 @@
 <div id="global">
 	<?=("important_msg")>
 	<div id="content" class="service">
-		<table><td width=50% valign="top"><tr>
-			<?DOBOXED(="aide_serverrestart_box", _("Restart Citadel"))>
-		</td></tr></table>
+		<div class="fix_scrollbar_bug">
+			<table><td width=50% valign="top"><tr>
+				<?DOBOXED(="aide_serverrestart_box", _("Restart Citadel"))>
+			</td></tr></table>
+		</div>
 	</div>
 <?=("trailing")>
diff --git a/webcit/static/t/aide/display_serverrestart_page_do.html b/webcit/static/t/aide/display_serverrestart_page_do.html
index 235d1f368..8b7af7ca2 100644
--- a/webcit/static/t/aide/display_serverrestart_page_do.html
+++ b/webcit/static/t/aide/display_serverrestart_page_do.html
@@ -23,8 +23,10 @@
 	<div id="global">
 		<?=("important_msg")>
 		<div id="content" class="service">
-			<table><td width=50% valign="top"><tr>
-				<?DOBOXED("box_serverrestartpagedo")>
-			</td></tr></table>
+			<div class="fix_scrollbar_bug">
+				<table><td width=50% valign="top"><tr>
+					<?DOBOXED("box_serverrestartpagedo")>
+				</td></tr></table>
+			</div>
 		</div>
 <?=("trailing")>
diff --git a/webcit/static/t/aide/display_sitewide_config.html b/webcit/static/t/aide/display_sitewide_config.html
index 252188c53..9bcf8784f 100644
--- a/webcit/static/t/aide/display_sitewide_config.html
+++ b/webcit/static/t/aide/display_sitewide_config.html
@@ -2,6 +2,7 @@
 <div id="banner">
 <h1><?_("Site configuration")></h1>
 </div>
+<div id="content" class="service fix_scrollbar_bug">
 <?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
 <??("COND:AIDE", 2)>
 <table border="0" cellspacing="0" cellpadding="0" ><tr><td>
@@ -20,4 +21,5 @@
 </form>
 </td></tr></table>
 <??("X", 2)>
+</div>
 <?=("trailing")>
diff --git a/webcit/static/t/aide/edituser/detailview.html b/webcit/static/t/aide/edituser/detailview.html
index 8396782b1..b210d7715 100644
--- a/webcit/static/t/aide/edituser/detailview.html
+++ b/webcit/static/t/aide/edituser/detailview.html
@@ -4,6 +4,7 @@
   <h1><?_("Edit user account: ")><?USERLIST:USERNAME("X")></h1>
 </div>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <table class="useredit_background"><tr><td>
 <form method="POST" action="edituser">
 <input type="hidden" name="username" value="<?USERLIST:USERNAME("X")>">
@@ -36,5 +37,5 @@
 </table>
 <input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp; <input type="submit" name="cancel" value="<?_("Cancel")>"><br /><br /></form>
 </center>
-</td></tr></table>
+</td></tr></table></div>
 <?=("trailing")>
diff --git a/webcit/static/t/aide/edituser/select.html b/webcit/static/t/aide/edituser/select.html
index 80d1b768a..1770cc86f 100644
--- a/webcit/static/t/aide/edituser/select.html
+++ b/webcit/static/t/aide/edituser/select.html
@@ -6,6 +6,7 @@
 </div>
 
 <div id="content" class="service"> 
+<div class="fix_scrollbar_bug">
 <?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
 <??("COND:AIDE", 2)>
  
@@ -19,4 +20,5 @@
 </td></tr>
 </table>
 <??("X", 2)>
+</div>
 <?=("trailing")>
diff --git a/webcit/static/t/display_main_menu.html b/webcit/static/t/display_main_menu.html
index 7a1a3db9a..dce01f9c9 100644
--- a/webcit/static/t/display_main_menu.html
+++ b/webcit/static/t/display_main_menu.html
@@ -2,6 +2,7 @@
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <?ROOMBANNER>
 <div id="content">
+<div class="fix_scrollbar_bug">
 <table width="100%" cellspacing="10" cellpadding="0">
 <tr><td colspan="2" class="advanced">
   <?DOBOXED("menu_basic_commands", _("Basic commands"))>
@@ -13,4 +14,5 @@
 </td></tr>
 </table>
 </div>
+</div>
 <?=("trailing")>
diff --git a/webcit/static/t/display_message.html b/webcit/static/t/display_message.html
index 685be28ef..95cd74f73 100644
--- a/webcit/static/t/display_message.html
+++ b/webcit/static/t/display_message.html
@@ -1,4 +1,4 @@
-<div class="message"
+<div class="fix_scrollbar_bug message"
 onMouseOver=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="visible"
 onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden" >
 <div class="message_header">
diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index f2ba910ae..7febb91f4 100644
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -2,7 +2,7 @@
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <?ROOMBANNER>
 <div id="content">
-<div class="message"><form name="enterform" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="post">
+<div class="fix_scrollbar_bug message "><form name="enterform" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="post">
 <input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
 <input type="hidden" name="return_to" value="<?BSTR("return_to")>">
 <input type="hidden" name="nonce" value="<?NONCE>">
diff --git a/webcit/static/t/files.html b/webcit/static/t/files.html
index c499776d3..cc6714900 100644
--- a/webcit/static/t/files.html
+++ b/webcit/static/t/files.html
@@ -11,6 +11,8 @@
 
 <div id="content" class="service">
 
+<div class="fix_scrollbar_bug">
+
 <table class="downloads_background">
 <tr>
   <th><?_("Filename")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filename")>&SortBy=<?SORT:NEXT("filename")>"><img border="0" src="<?SORT:ICON("filename")>" /></a> </th>
diff --git a/webcit/static/t/files/picview.js b/webcit/static/t/files/picview.js
index 67d7a2243..4750e9288 100644
--- a/webcit/static/t/files/picview.js
+++ b/webcit/static/t/files/picview.js
@@ -7,6 +7,7 @@
 </h1>
 </div>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <table class="downloads_background"><tr><td>
 <script type="text/javascript" language="JavaScript" > nvar fadeimages=new Array()
 <?ITERATE("ROOM:FILES", ="files_section_onefile_picview")>
@@ -16,4 +17,5 @@
 <script type="text/javascript" >
 new fadeshow(fadeimages, 500, 400, 0, 3000, 1, "R");
 </script></td><th>
+</div>
 <?=("trailing")>
diff --git a/webcit/static/t/floors.html b/webcit/static/t/floors.html
index 37e976ee2..bb0a0c3c1 100644
--- a/webcit/static/t/floors.html
+++ b/webcit/static/t/floors.html
@@ -4,7 +4,7 @@
         <h1><?_("Add/change/delete floors")></h1>
 </div>
 
-<div id="content" class="service">
+<div id="content" class="service fix_scrollbar_bug">
 	<table border="1" width="100%" bgcolor="#ffffff">
 		<tr>
 			<th><?_("Floor number")></th>
@@ -27,4 +27,5 @@
 			<td>&nbsp;</td>
 		</tr>
 	</table>
+</div>
 <?=("trailing")>
diff --git a/webcit/static/t/iconbar/edit.html b/webcit/static/t/iconbar/edit.html
index 990919655..2ca84b9cb 100644
--- a/webcit/static/t/iconbar/edit.html
+++ b/webcit/static/t/iconbar/edit.html
@@ -5,6 +5,7 @@
 <?_("Customize the icon bar")>
 </h1></div>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <form method="post" action="commit_iconbar">
 <input type="hidden" name="nonce" value="<?NONCE>">
 <table class="altern" >
@@ -94,5 +95,5 @@
 
 <center><input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp;<input type="submit" name="cancel_button" value="<?_("Cancel")>"></center>
 
-</form>
+</form></div>
 <?=("trailing")>
diff --git a/webcit/static/t/knrooms.html b/webcit/static/t/knrooms.html
index 4a78740bb..ae96574e4 100644
--- a/webcit/static/t/knrooms.html
+++ b/webcit/static/t/knrooms.html
@@ -26,19 +26,23 @@ OnChange="location.href=roomlistomatic.newview.options[selectedIndex].value">
 
 <??("COND:PREF", 2, "roomlistview", "folders")>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <table BORDER=0 WIDTH=96%% CELLPADDING=5>
 <?ITERATE("LKRA", ="knrooms_rooms")>
 </table>
+</div>
 <??("X", 2)>
 
 <?!("COND:PREF", 3, "roomlistview", "folders")>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <div class="box">
  <div class="boxlabel"><?_("Room Listing")></div>
   <div class="boxcontent">
    <div id="roomlist_knrooms"></div>
   </div>
 </div>
+</div>
 <?!("X", 3)>
 <script type="text/javascript">
 FillRooms(KNRoomsRoomList);
diff --git a/webcit/static/t/room/create.html b/webcit/static/t/room/create.html
index 81d4011bd..5bd7edbaf 100644
--- a/webcit/static/t/room/create.html
+++ b/webcit/static/t/room/create.html
@@ -6,6 +6,8 @@
 <div id="banner">
 <?=("roombanner")>
 </div>
+<div id="content" class="service fix_scrollbar_bug">
+
 <?=("beginbox_1")><?_("Create a new room")><?=("beginbox_2")>
 
 
@@ -103,5 +105,7 @@ else {
 <?=("endbox")>
 
 
+
+</div>
 <?=("trailing")>
 <??("X", 11)>
diff --git a/webcit/static/t/room/display_private.html b/webcit/static/t/room/display_private.html
index c71540651..72dddc4f1 100644
--- a/webcit/static/t/room/display_private.html
+++ b/webcit/static/t/room/display_private.html
@@ -2,7 +2,7 @@
 <div id="banner">
 <?=("roombanner")>
 </div>
-<div id="content" class="service">
+<div id="content" class="service fix_scrollbar_bug">
 
 <?=("beginbox_1")><?_("Go to a hidden room")><?=("beginbox_2")>
 <p><?_("If you know the name of a hidden (guess-name) or passworded room, you can enter that room by typing its name below.  Once you gain access to a private room, it will appear in your regular room listings so you don‘t have to keep returning here.")></p>
diff --git a/webcit/static/t/room/edit.html b/webcit/static/t/room/edit.html
index a4d58195d..ffae715ad 100644
--- a/webcit/static/t/room/edit.html
+++ b/webcit/static/t/room/edit.html
@@ -1,5 +1,6 @@
 <?=("head")><?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <?ROOMBANNER>
+<div id="content" class="service fix_scrollbar_bug">
 
 <table border="0" cellspacing="0" cellpadding="0" ><tr><td>
 <?DOTABBED(_("Administration"), ="room_edit_tab_admin",
@@ -12,5 +13,6 @@
 	   "", ="room_edit_submit")>
 </td></tr></table>
 
+</div>
 <?=("addressbook_popup")>
 <?=("trailing")>
diff --git a/webcit/static/t/room/edit/editroom.html b/webcit/static/t/room/edit/editroom.html
index b47be129d..e547bb5a5 100644
--- a/webcit/static/t/room/edit/editroom.html
+++ b/webcit/static/t/room/edit/editroom.html
@@ -1,13 +1,17 @@
-<table border="0" cellspacing="0" cellpadding="0"><tr><td>
-	<form method="post" action="siteconfig">
-		<input type="hidden" name="nonce" value= '<?NONCE>' />
-		<?DOTABBED(_("Administration"), "tab_editroom_admin",
-			_("Configuration"), "tab_editroom_admin",
-			_("Message expire policy"), "tab_editroom_expire",
-			_("Access controls"), "tab_editroom_access",
-			_("Sharing"), "tab_editroom_sharing",
-			_("Mailing list service"), "tab_editroom_listserv",
-			_("Remote retrieval"), "tab_editroom_feeds",
-			"", "submit_editroom")>
-	</form>
-</td></tr></table>
+<div class="fix_scrollbar_bug">
+	<table border="0" cellspacing="0" cellpadding="0"><tr><td>
+		<form method="post" action="siteconfig">
+			<input type="hidden" name="nonce" value= '<?NONCE>' />
+			<?DOTABBED(_("Administration"), "tab_editroom_admin",
+				_("Configuration"), "tab_editroom_admin",
+				_("Message expire policy"), "tab_editroom_expire",
+				_("Access controls"), "tab_editroom_access",
+				_("Sharing"), "tab_editroom_sharing",
+				_("Mailing list service"), "tab_editroom_listserv",
+				_("Remote retrieval"), "tab_editroom_feeds",
+				"", "submit_editroom")>
+		</form>
+	</td></tr></table>
+</div>
+
+
diff --git a/webcit/static/t/room/zapped_list.html b/webcit/static/t/room/zapped_list.html
index e9f79fd72..3a1845149 100644
--- a/webcit/static/t/room/zapped_list.html
+++ b/webcit/static/t/room/zapped_list.html
@@ -2,7 +2,7 @@
 <div id="banner">
 <?=("roombanner")>
 </div>
-<div id="content" class="service">
+<div id="content" class="service fix_scrollbar_bug">
 
 <?=("beginbox_1")><?_("Zapped (forgotten) rooms")><?=("beginbox_2")>
 <?ITERATE("LZRM", ="room_zap_entry")>
diff --git a/webcit/static/t/summary_trailer.html b/webcit/static/t/summary_trailer.html
index 5a3ac48f5..c5c282762 100644
--- a/webcit/static/t/summary_trailer.html
+++ b/webcit/static/t/summary_trailer.html
@@ -1,6 +1,6 @@
 </div>
 </div>
 <div id="resize_msglist" onMouseDown="CtdlResizeMsgListMouseDown(event)">
-<hr>
-</div>
+<div class="fix_scrollbar_bug"> <hr>
+</div></div>
 <div id="preview_pane">
diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index 9e727645e..941f98b9e 100644
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -1,4 +1,4 @@
-<div class="message"
+<div class="fix_scrollbar_bug message"
 onMouseOver=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="visible"
 onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden" >
 
diff --git a/webcit/static/t/view_message/print.html b/webcit/static/t/view_message/print.html
index 31ce1cefd..f1da75bcf 100644
--- a/webcit/static/t/view_message/print.html
+++ b/webcit/static/t/view_message/print.html
@@ -2,7 +2,7 @@
 <?CURRENT_USER>
 </title></head>
 <body onLoad=" window.print(); window.close(); ">
-<div class="message"
+<div class="fix_scrollbar_bug message"
 <div class="message_header"><span><?MAIL:SUMM:DATEFULL></span>
  <span><?MAIL:SUMM:DATEFULL></span>
  <?_("from ")>
diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html
index 8ace515af..9a32b6efe 100644
--- a/webcit/static/t/who.html
+++ b/webcit/static/t/who.html
@@ -20,7 +20,7 @@ return confirm('<?_("Do you really want to kill this session?")>');
 </li></ul>
 </div>
 </div>
-<div id="content" class="who_is_online">
+<div id="content" class="fix_scrollbar_bug who_is_online">
 <?DOBOXED(="who_box_list_static", ="who_list_static_header")>
 </div>
 <script type="text/javascript">
diff --git a/webcit/tasks.c b/webcit/tasks.c
index d4b5b27ae..42ae949ba 100644
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -89,7 +89,9 @@ int tasks_RenderView_or_Tail(SharedMessageStatus *Stat,
 	icalproperty *p;
 	wcsession *WCC = WC;
 
-	wc_printf("<table class=\"calendar_view_background\"><tbody id=\"taskview\">\n<tr>\n<th>");
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"calendar_view_background\"><tbody id=\"taskview\">\n<tr>\n"
+		"<th>");
 	wc_printf(_("Completed?"));
 	wc_printf("</th><th>");
 	wc_printf(_("Name of task"));
@@ -161,7 +163,7 @@ int tasks_RenderView_or_Tail(SharedMessageStatus *Stat,
 		wc_printf("</tr>");
 	}
 
-	wc_printf("</tbody></table>\n");
+	wc_printf("</tbody></table></div>\n");
 
 	/* Free the list */
 	DeleteHash(&WC->disp_cal_items);
diff --git a/webcit/userlist.c b/webcit/userlist.c
index 2f605adcc..5b08a8885 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -50,7 +50,8 @@ void userlist(void)
 		goto DONE;
 	}
 
-	wc_printf("<table class=\"userlist_background\"><tr><td>\n");
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"userlist_background\"><tr><td>\n");
 	wc_printf("<tr><th>%s</th><th>%s</th><th>%s</th>"
 			"<th>%s</th><th>%s</th><th>%s</th></tr>",
 			_("User Name"),
@@ -95,7 +96,7 @@ void userlist(void)
 			extract_long(buf, 4), extract_long(buf, 5));
 
 	}
-	wc_printf("</table>\n");
+	wc_printf("</table></div>\n");
 DONE:	wDumpContent(1);
 }
 
@@ -121,7 +122,8 @@ void showuser(void)
 
         wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wc_printf("<table class=\"userlist_background\"><tr><td>\n");
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"userlist_background\"><tr><td>\n");
 
 	serv_printf("OIMG _userpic_|%s", who);
 	serv_getln(buf, sizeof buf);
@@ -156,7 +158,7 @@ void showuser(void)
 	escputs(buf);
 	wc_printf("</a>\n");
 
-	wc_printf("</td></tr></table>\n");
+	wc_printf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index c2bf41d47..d5369aa78 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -841,7 +841,8 @@ void do_edit_vcard(long msgnum, char *partnum,
 		wc_printf("\">\n");
 	}
 
-	wc_printf("<table class=\"vcard_edit_background\"><tr><td>\n");
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"vcard_edit_background\"><tr><td>\n");
 
 	wc_printf("<table border=0><tr>"
 		"<td>%s</td>"
diff --git a/webcit/wiki.c b/webcit/wiki.c
index c5bb3086c..34067244f 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -160,7 +160,9 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 		StrBuf *author = NewStrBuf();
 		StrBuf *node = NewStrBuf();
 
-		wc_printf("<table class=\"wiki_history_background\">");
+		wc_printf("<div class=\"fix_scrollbar_bug\">"
+			"<table class=\"wiki_history_background\">"
+		);
 
 		wc_printf("<th>%s</th>", _("Date"));
 		wc_printf("<th>%s</th>", _("Author"));
@@ -280,7 +282,10 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 	if (GetServerStatus(Buf, NULL) == 1) {
 		StrBuf *pagetitle = NewStrBuf();
 
-		wc_printf("<table class=\"wiki_pagelist_background\">");
+		wc_printf("<div class=\"fix_scrollbar_bug\">"
+			"<table class=\"wiki_pagelist_background\">"
+		);
+
 		wc_printf("<th>%s</th>", _("Page title"));
 
 		while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
-- 
2.30.2