diff --git a/app/config/errors.php b/app/config/errors.php
index 4cc8e734ee..2ecef0ea09 100644
--- a/app/config/errors.php
+++ b/app/config/errors.php
@@ -4,8 +4,8 @@
  * List of server wide error codes and their respective messages.
  */
 
-use Appwrite\Enum\MessageStatus;
 use Appwrite\Extend\Exception;
+use Appwrite\Messaging\Status as MessageStatus;
 
 return [
     /** General Errors */
diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 258c193a52..09d099a666 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2,11 +2,11 @@
 
 use Appwrite\Auth\Validator\Phone;
 use Appwrite\Detector\Detector;
-use Appwrite\Enum\MessageStatus;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Messaging;
 use Appwrite\Extend\Exception;
+use Appwrite\Messaging\Status as MessageStatus;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Permission;
 use Appwrite\Role;
diff --git a/src/Appwrite/Enum/MessageStatus.php b/src/Appwrite/Messaging/Status.php
similarity index 91%
rename from src/Appwrite/Enum/MessageStatus.php
rename to src/Appwrite/Messaging/Status.php
index 5bfb0fa4c9..c9d7658fcb 100644
--- a/src/Appwrite/Enum/MessageStatus.php
+++ b/src/Appwrite/Messaging/Status.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Enum;
+namespace Appwrite\Messaging;
 
-class MessageStatus
+class Status
 {
     /**
      * Message that is not ready to be sent
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index f1a0bea6e6..00dc905d6a 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Workers;
 
-use Appwrite\Enum\MessageStatus;
 use Appwrite\Extend\Exception;
+use Appwrite\Messaging\Status as MessageStatus;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Database\Helpers\ID;
diff --git a/tests/e2e/Services/Messaging/MessagingBase.php b/tests/e2e/Services/Messaging/MessagingBase.php
index d5ac040a75..59a5d5dec2 100644
--- a/tests/e2e/Services/Messaging/MessagingBase.php
+++ b/tests/e2e/Services/Messaging/MessagingBase.php
@@ -2,7 +2,7 @@
 
 namespace Tests\E2E\Services\Messaging;
 
-use Appwrite\Enum\MessageStatus;
+use Appwrite\Messaging\Status as MessageStatus;
 use Tests\E2E\Client;
 use Utopia\App;
 use Utopia\Database\Helpers\ID;