diff --git a/ChangeLog b/ChangeLog
index e91bb16d2..809674e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+	-lastFirstMessageNumber]): new accessor that returns the first
+	message number of the last series of messages.
+
 2007-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailBodyPart.m ([SOGoMailBodyPart
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 2574e4877..5bf7ababf 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -116,9 +116,10 @@
 "Unread"        = "Unread";
 "messages"      = "messages";
 
-"first"         = "first";
-"previous"      = "prev";
-"next"          = "next";
+"first"         = "First";
+"previous"      = "Previous";
+"next"          = "Next";
+"last"          = "Last";
 
 "msgnumber_to"  = "to";
 "msgnumber_of"  = "of";
diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index 6c805eaa1..6f9acb86b 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -118,8 +118,9 @@
 "messages"      = "message(s)";
 
 "first"         = "Premier";
-"previous"      = "précédent";
-"next"          = "suivant";
+"previous"      = "Précédent";
+"next"          = "Suivant";
+"last"          = "Dernier";
 
 "Mark Unread" = "Marquer comme non lu"; 
 "Mark Read"   = "Marquer comme lu";
diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings
index 40d826d2f..4f5f98900 100644
--- a/UI/MailerUI/German.lproj/Localizable.strings
+++ b/UI/MailerUI/German.lproj/Localizable.strings
@@ -103,6 +103,7 @@
 "first"         = "Erste";
 "previous"      = "Vorherige";
 "next"          = "Nächste";
+"last"          = "Letzter";
 
 "Mark Unread" = "Als ungelesen markieren"; 
 "Mark Read"   = "Als gelesen markieren";
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 162514211..edb5e4512 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -263,6 +263,7 @@ static int attachmentFlagSize = 8096;
 - (NSArray *) sortedUIDs 
 {
   EOQualifier *fetchQualifier, *notDeleted;
+
   if (!sortedUIDs)
     {
       notDeleted = [EOQualifier qualifierWithQualifierFormat:
@@ -354,6 +355,21 @@ static int attachmentFlagSize = 8096;
   return [self firstMessageNumber] + [self fetchRange].length;
 }
 
+- (unsigned int) lastFirstMessageNumber 
+{
+  unsigned int max, modulo;
+
+  if (!sortedUIDs)
+    [self sortedUIDs];
+
+  max = [sortedUIDs count];
+  modulo = (max % messagesPerPage);
+  if (modulo == 0)
+    modulo = messagesPerPage;
+
+  return (max + 1 - modulo);
+}
+
 - (unsigned int) prevFirstMessageNumber 
 {
   NSRange  r;
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index cae21ceb3..31d5ed63f 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -48,6 +48,9 @@
 	    >| <a href="#"
 	      var:idx="nextFirstMessageNumber"
 	      ><var:string label:value="next" /></a>
+	    | <a href="#"
+	      var:idx="lastFirstMessageNumber"
+	      ><var:string label:value="last" /></a>
 	  </var:if>
         </var:if
 	  ></td
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index f9a708dd0..57d718f6f 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -944,16 +944,16 @@ var mailboxSpanDrop = function(data) {
   }
   else
     success = false;
-  
+
   return success;
 }
-    
+
 var plusSignEnter = function() {
   var nodeNr = parseInt(this.id.substr(2));
   if (!mailboxTree.aNodes[nodeNr]._io)
     this.plusSignTimer = setTimeout("openPlusSign('" + nodeNr + "');", 1000);
 }
-      
+
 var plusSignExit = function() {
   if (this.plusSignTimer) {
     clearTimeout(this.plusSignTimer);