diff --git a/bug_sponsorship_list_view_inc.php b/bug_sponsorship_list_view_inc.php
index e955ab4615..533b74a827 100644
--- a/bug_sponsorship_list_view_inc.php
+++ b/bug_sponsorship_list_view_inc.php
@@ -6,7 +6,7 @@
 	# See the files README and LICENSE for details
 
 	# --------------------------------------------------------
-	# $Id: bug_sponsorship_list_view_inc.php,v 1.8 2004-07-17 23:52:56 vboctor Exp $
+	# $Id: bug_sponsorship_list_view_inc.php,v 1.9 2004-07-18 13:22:28 vboctor Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -50,8 +50,7 @@
 			<img src="images/dollars.gif" alt="Sponsor Me" border="0" />
 		</td>
 		<td class="form-title" colspan="2">
-			<a href="" onClick="ToggleDiv( 'sponsorship', g_div_sponsorship ); return false;"
-				><img border="0" src="images/minus.png" alt="-" /></a>
+			<?php collapse_icon( 'sponsorship' ); ?>
 		<?php
 			echo lang_get( 'users_sponsoring_bug' );
 
@@ -123,9 +122,8 @@
 <table class="width100" cellspacing="1">
 	<tr>
 		<td class="form-title">
-			<a href="" onClick="ToggleDiv( 'sponsorship', g_div_sponsorship ); return false;"
-				><img border="0" src="images/plus.png" alt="+" /></a>
 <?php
+			collapse_icon( 'sponsorship' );
 			echo lang_get( 'users_sponsoring_bug' );
 
 			$t_details_url = lang_get( 'sponsorship_process_url' );
diff --git a/core/collapse_api.php b/core/collapse_api.php
index 35bcf00306..10b0c301eb 100644
--- a/core/collapse_api.php
+++ b/core/collapse_api.php
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: collapse_api.php,v 1.1 2004-07-17 23:52:56 vboctor Exp $
+	# $Id: collapse_api.php,v 1.2 2004-07-18 13:22:28 vboctor Exp $
 	# --------------------------------------------------------
 
 	$t_core_dir = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
@@ -73,6 +73,10 @@ function collapse_closed( $p_name ) {
 	# This is used within both the open and closed section to identify the location where the
 	# '+'/'-' icon should be placed.
 	function collapse_icon( $p_name ) {
+		if ( OFF == config_get( 'use_javascript' ) ) {
+			return;
+		}
+
 		global $g_open_collapse_section;
 
 		if ( $g_open_collapse_section === true ) {
diff --git a/core/relationship_api.php b/core/relationship_api.php
index e9f9ba76ac..bca9b8872d 100644
--- a/core/relationship_api.php
+++ b/core/relationship_api.php
@@ -6,11 +6,13 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: relationship_api.php,v 1.12 2004-07-18 00:07:44 vboctor Exp $
+	# $Id: relationship_api.php,v 1.13 2004-07-18 13:22:29 vboctor Exp $
 	# --------------------------------------------------------
 
 	### Relationship API ###
 
+	require_once( $t_core_dir . 'collapse_api.php' );
+
 	# MASC RELATIONSHIP
 
 	# --------------------------------------------------------
@@ -544,27 +546,14 @@ function relationship_view_box( $p_bug_id ) {
 ?>
 <br/>
 
-<?php if ( ON == config_get( 'use_javascript' ) ) { ?>
-<div id="relationships_closed">
-<table class="width100" cellspacing="1">
-<tr>
-	<td class="form-title">
-		<a href="" onClick="ToggleDiv( 'relationships', g_div_relationships ); return false;"
-			><img border="0" src="images/plus.png" alt="+" /></a>
-		<?php PRINT lang_get( 'bug_relationships' ) ?>
-	</td>
-</tr>
-</table>
-</div>
-<?php } ?>
-
-<div id="relationships_open">
+<?php collapse_open( 'relationships' ); ?>
 <table class="width100" cellspacing="1">
 <tr class="row-2">
 	<td width="15%" class="form-title">
-		<a href="" onClick="ToggleDiv( 'relationships', g_div_relationships ); return false;"
-			><img border="0" src="images/minus.png" alt="-" /></a>
-		<?php PRINT lang_get( 'bug_relationships' ) ?>
+		<?php
+			collapse_icon( 'relationships' );
+			echo lang_get( 'bug_relationships' );
+		?>
 	</td>
 	<td><?php PRINT relationship_get_summary_html( $p_bug_id ) ?></td>
 </tr>
@@ -596,16 +585,22 @@ function relationship_view_box( $p_bug_id ) {
 		}
 ?>
 </table>
-</div>
 
-<?php if ( ON == config_get( 'use_javascript' ) ) { ?>
-<script type="text/JavaScript">
-	SetDiv( "relationships", g_div_relationships );
-</script>
-<?php } ?>
+<?php collapse_closed( 'relationships' ); ?>
+<table class="width100" cellspacing="1">
+<tr>
+	<td class="form-title">
+		<?php
+			collapse_icon( 'relationships' );
+			echo lang_get( 'bug_relationships' );
+		?>
+	</td>
+</tr>
+</table>
 
 <?php
+		collapse_end( 'relationships' );
 	}
 
 	# MASC RELATIONSHIP
-?>
+?>
\ No newline at end of file