diff --git a/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp b/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp
index 687661ac9..395c43028 100755
--- a/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp
+++ b/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp
@@ -3723,6 +3723,8 @@ void IMAPData::setFetchUID(const String &fetchUID)
   std::string().swap(tmp);
 }
 
+extern FS *ufsp;
+
 void IMAPData::setFileStorageType(uint8_t storageType)
 {
   _storageType = storageType;
@@ -3736,6 +3738,9 @@ void IMAPData::setFileStorageType(uint8_t storageType)
     case MailClientStorageType::FFat:
       fsp = &FFat;
       break;
+    case MailClientStorageType::Univ:
+      fsp = ufsp;
+      break;
   }
 }
 
@@ -4766,6 +4771,9 @@ void SMTPData::setFileStorageType(uint8_t storageType)
     case MailClientStorageType::FFat:
       fsp = &FFat;
       break;
+    case MailClientStorageType::Univ:
+      fsp = ufsp;
+      break;
   }
 }
 
diff --git a/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h b/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h
index b6a8da775..0b1f4496c 100755
--- a/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h
+++ b/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h
@@ -92,6 +92,7 @@ struct MailClientStorageType
   static const uint8_t SPIFFS = 0;
   static const uint8_t SD = 1;
   static const uint8_t FFat = 2;
+  static const uint8_t Univ = 3;
 };
 
 static const char ESP32_MAIL_STR_1[] PROGMEM = "Content-Type: multipart/mixed; boundary=\"";