diff --git a/ChangeLog b/ChangeLog
index 3e25ed1f8..b4ba42f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailFolderMenu.m ([UIxMailFolderMenu
+	-iconForMenuItem]): new method that returns the fully qualified
+	relative URL to the icon representing the mailbox, or the default
+	mailbox icon if needed.
+
 	* UI/SOGoUI/UIxComponent.m ([UIxComponent
 	-urlForResourceFilename:filename]): automatically return an empty
 	string whenever the filename passed as argument is nil.
diff --git a/UI/MailerUI/UIxMailFolderMenu.m b/UI/MailerUI/UIxMailFolderMenu.m
index 8c440c8fc..e90d9f40c 100644
--- a/UI/MailerUI/UIxMailFolderMenu.m
+++ b/UI/MailerUI/UIxMailFolderMenu.m
@@ -70,4 +70,15 @@
   return levelledNodes;
 }
 
+- (NSString *) iconForMenuItem
+{
+  NSString *iconName;
+
+  iconName = [item iconName];
+  if (!iconName)
+    iconName = [self defaultIconName];
+
+  return [self urlForResourceFilename: iconName];
+}
+
 @end