fix for bug #551310. The $optional_delimiter is now only added to the $default_folder...