diff --git a/extract-and-index-evolution-mail-storage b/extract-and-index-evolution-mail-storage
index 47dbb37..705cfca 100755
--- a/extract-and-index-evolution-mail-storage
+++ b/extract-and-index-evolution-mail-storage
@@ -180,7 +180,8 @@ done
 echo "Indexing mails... please wait..."
 
 mailboxes="$( find "${T_PRE}${S_PRE}/${user}" \
-  -type d -regex ".*\(cur\|new\|tmp\)" -exec dirname '{}' \; )"
+  -type d \( -name "cur" -or -name "new" -or -name "tmp" \) \
+  -exec dirname '{}' \; )"
 
 IFS=$'\n'
 for mailbox in ${mailboxes} ; do