diff --git a/ChangeLog b/ChangeLog
index f7b0ae82c..3e25ed1f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent
+	-urlForResourceFilename:filename]): automatically return an empty
+	string whenever the filename passed as argument is nil.
+
 	* UI/WebServerResources/MailerUI.js: open the mailboxes with the
 	"desc" parameter set to 1 so that they are sorted in descending
 	order by default. Also, added "onHeaderClick()", triggered by
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 841a61679..fc93e6866 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -498,28 +498,33 @@ static BOOL uixDebugEnabled = NO;
   WOResourceManager *rm;
   NSBundle *pageBundle;
 
-  if (!pageToURL)
-    pageToURL = [[NSMutableDictionary alloc] initWithCapacity: 32];
-
-  url = [pageToURL objectForKey: filename];
-  if (!url)
+  if (filename)
     {
-      rm = [self pageResourceManager];
-      page = [[self context] page];
-      pageBundle = [NSBundle bundleForClass: [page class]];
-      url = [rm urlForResourceNamed: filename
-		inFramework: [pageBundle bundlePath]
-		languages: nil
-		request: [[self context] request]];
+      if (!pageToURL)
+        pageToURL = [[NSMutableDictionary alloc] initWithCapacity: 32];
+
+      url = [pageToURL objectForKey: filename];
       if (!url)
-	url = @"";
-      else
-        if ([url hasPrefix: @"http"])
-          url = [url hostlessURL];
-      [pageToURL setObject: url forKey: filename];
-    }
+        {
+          rm = [self pageResourceManager];
+          page = [[self context] page];
+          pageBundle = [NSBundle bundleForClass: [page class]];
+          url = [rm urlForResourceNamed: filename
+                    inFramework: [pageBundle bundlePath]
+                    languages: nil
+                    request: [[self context] request]];
+          if (!url)
+            url = @"";
+          else
+            if ([url hasPrefix: @"http"])
+              url = [url hostlessURL];
+          [pageToURL setObject: url forKey: filename];
+        }
 
 //   NSLog (@"url for '%@': '%@'", filename, url);
+    }
+  else
+    url = @"";
 
   return url;
 }