diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 10ea4d8..d7cb7fd 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -124,7 +124,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
       const reEmailUser = mailData.info?.MAI_OPI_SN
       const reEmailUserMat = mailData.info?.MAI_MAT_SN
 
-      setEmailOrder((prev) => reEmailO || prev)
+      setEmailOrder((prev) => reEmailO || prev || fromOrder)
       setEmailOPI((prev) => reEmailUser || prev)
       setEmailMat((prev) => reEmailUserMat || prev)