diff --git a/ChangeLog b/ChangeLog
index 291e7f52f..bac7ff473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Common/UIxPageFrame.m ([UIxPageFrame -isCalendar])
+	([UIxPageFrame -isContacts], [UIxPageFrame -isMail]): getters to
+	determine which module is the current one.
+
 2007-12-06  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/NSArray+Scheduler.m ([NSArray -compareEventsTitleAscending:otherEvent])
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index b3565daed..54b70d5d7 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -325,6 +325,30 @@
   return ([[self productCSSURL] length] > 0);
 }
 
+- (BOOL) _moduleIs: (NSString *) moduleName
+{
+  NSString *frameworkName;
+
+  frameworkName = [[context page] frameworkName];
+
+  return [frameworkName isEqualToString: moduleName];
+}
+
+- (BOOL) isCalendar
+{
+  return [self _moduleIs: @"SchedulerUI"];
+}
+
+- (BOOL) isContacts
+{
+  return [self _moduleIs: @"ContactsUI"];
+}
+
+- (BOOL) isMail
+{
+  return [self _moduleIs: @"MailerUI"];
+}
+
 - (void) setToolbar: (NSString *) newToolbar
 {
   ASSIGN (toolbar, newToolbar);
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index d942676ed..3d936ae62 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -52,16 +52,37 @@
 		  <a id="logoff" var:href="logoffPath"
 		    ><var:string label:value="Disconnect" /></a>
 		  <var:if condition="userHasCalendarAccess">
-		    <a id="calendarBannerLink"
-		      var:href="relativeCalendarPath"
-		      ><var:string label:value="Calendar" /></a> |
+		    <var:if condition="isCalendar">
+		      <span class="active"><var:string label:value="Calendar"
+			  /></span>
+		    </var:if>
+		    <var:if condition="isCalendar" const:negate="YES">
+		      <a id="calendarBannerLink"
+			var:href="relativeCalendarPath"
+			><var:string label:value="Calendar" /></a>
+		    </var:if>
+		    |
 		  </var:if>
-		  <a id="contactsBannerLink"
-		    var:href="relativeContactsPath"
-		    ><var:string label:value="Address Book" /></a> |
+		  <var:if condition="isContacts">
+		    <span class="active"><var:string label:value="Address Book"
+			/></span>
+		  </var:if>
+		  <var:if condition="isContacts" const:negate="YES">
+		    <a id="contactsBannerLink"
+		      var:href="relativeContactsPath"
+		      ><var:string label:value="Address Book" /></a>
+		  </var:if>
+		  |
 		  <var:if condition="userHasMailAccess">
-		    <a id="mailBannerLink" var:href="relativeMailPath"
-		      ><var:string label:value="Mail" /></a> |
+		    <var:if condition="isMail">
+		      <span class="active"><var:string label:value="Mail"
+			  /></span>
+		    </var:if>
+		    <var:if condition="isMail" const:negate="YES">
+		      <a id="mailBannerLink" var:href="relativeMailPath"
+			><var:string label:value="Mail" /></a>
+		    </var:if>
+		      |
 		  </var:if>
 		  <a id="preferencesBannerLink"
 		    var:href="relativePreferencesPath"
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 62776f379..0200a3222 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -137,12 +137,17 @@ DIV.linkbanner
   z-index: 100;
   color: #aaa; }
 
-DIV.linkbanner A
-{ top: 0px;
-  left: 0px;
+DIV.linkbanner A,
+DIV.linkbanner SPAN
+{ cursor: default;
   color: #ddd;
   text-decoration: none;
-  padding: .2em .5em; }
+  top: 0px;
+  left: 0px;
+  padding: 2px 5px; }
+
+DIV.linkbanner SPAN
+{ color: #afafff; }
 
 DIV.linkbanner A:hover
 { color: #dd5; }