diff --git a/ChangeLog b/ChangeLog
index 64d91baa8..b3a3b9cce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/UIxFilterEditor.js (loadMailboxes): the
+	first account is now always identitied with "0", therefore we no
+	longer need the "firstMailAccount" variable.
+
+	* UI/PreferencesUI/UIxFilterEditor.m (-firstMailAccount): removed
+	osbolete accessor.
+
 	* UI/WebServerResources/UIxPreferences.js: (onMailAccountAdd)
 	(onMailAccountDelete): set "hasChanged" to 1 when triggered.
 	(onColorPickerChoice): don't invoke "onChoiceChanged" as it is an
diff --git a/UI/PreferencesUI/UIxFilterEditor.m b/UI/PreferencesUI/UIxFilterEditor.m
index 894728afe..28ce6c231 100644
--- a/UI/PreferencesUI/UIxFilterEditor.m
+++ b/UI/PreferencesUI/UIxFilterEditor.m
@@ -80,26 +80,4 @@
   return filterId;
 }
 
-- (NSString *) firstMailAccount
-{
-  NSArray *accounts;
-  NSDictionary *account;
-  NSString *login, *accountName;
-  SOGoUser *ownerUser;
-
-  login = [[self clientObject] nameInContainer];
-  ownerUser = [SOGoUser userWithLogin: login];
-
-  accounts = [ownerUser mailAccounts];
-  if ([accounts count] > 0)
-    {
-      account = [accounts objectAtIndex: 0];
-      accountName = [[account objectForKey: @"name"] asCSSIdentifier];
-    }
-  else
-    accountName = @"";
-
-  return accountName;
-}
-
 @end
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index 87cfeec15..0b3f0aeac 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -13,7 +13,6 @@
   >
   <script type="text/javascript">
     var filterId = '<var:string value="filterId"/>';
-    var firstMailAccount = '<var:string value="firstMailAccount"/>';
   </script>
   <form id="mainForm" var:href="ownPath">
     <div id="filterNameContainer" class="container">
diff --git a/UI/WebServerResources/UIxFilterEditor.js b/UI/WebServerResources/UIxFilterEditor.js
index 0fe3bc0d7..b53e617ac 100644
--- a/UI/WebServerResources/UIxFilterEditor.js
+++ b/UI/WebServerResources/UIxFilterEditor.js
@@ -38,8 +38,7 @@ function onLoadHandler() {
 }
 
 function loadMailboxes() {
-    var url = (ApplicationBaseURL + "Mail/"
-               + encodeURI(firstMailAccount) + "/mailboxes");
+    var url = ApplicationBaseURL + "Mail/0/mailboxes";
     triggerAjaxRequest(url, onLoadMailboxesCallback);
 }