From 87254a76fab62defc1242caed835d3bdd346b919 Mon Sep 17 00:00:00 2001
From: Piotr Tanski <piotr.tanski@mudita.com>
Date: Mon, 23 Nov 2020 09:45:22 +0100
Subject: [PATCH] [EGD-4371] Fixed saving a draft message for a phone number
 (#1041)

---
 changelog.md                                            | 1 +
 module-apps/application-messages/windows/NewMessage.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 940ec2cbd73b7a6707357a6a41c514b4f894f34b..cb99962d2b08bf2642ea6d2bdea0260adf66a78e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,7 @@
 
 * `[desktop]` Fixed ScreenlockCheckEvent handler 
 * `[messages]` Fix for changing the content of option windows when forwarding a message.
+* `[messages]` Fixed saving a draft message for a phone number.
 
 ### Changed
 
diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp
index d6a7ea86b35e4f6660673f62deb7209564937909..ef3a495a8a9507810f3fc98428f3d2f73fdfa0f1 100644
--- a/module-apps/application-messages/windows/NewMessage.cpp
+++ b/module-apps/application-messages/windows/NewMessage.cpp
@@ -301,7 +301,7 @@ namespace gui
         if (contact && !(contact->numbers.empty())) {
             return addDraft(*contact);
         }
-        if (const auto &number = getPhoneNumber(); number.isValid()) {
+        if (const auto &number = getPhoneNumber(); !number.get().empty()) {
             return addDraft(number);
         }
         return false;