performance improvements

2 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 9d23d5461..e280d2527 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -776,9 +776,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public synchronized boolean isWebUri() {
-        String url = body.trim();
         if (isWebUri == null) {
-            isWebUri = Patterns.AUTOLINK_WEB_URL.matcher(url).matches() && !url.contains(" ");
+            isWebUri = Patterns.WEB_URL.matcher(body).matches();
         }
         return isWebUri;
     }
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 910d907a7..c47850461 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -644,7 +644,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             binding.scrollToBottomButton.setEnabled(true);
             binding.scrollToBottomButton.show();
             if (lastMessageUuid == null) {
-                lastMessageUuid = conversation.getLatestMessage().getUuid();
+                new Thread(lastMessageUuid = conversation.getLatestMessage().getUuid()).start();
             }
             if (conversation.getReceivedMessagesCountSinceUuid(lastMessageUuid) > 0) {
                 binding.unreadCountCustomView.setVisibility(View.VISIBLE);