diff --git a/BeagleIM.xcodeproj/project.pbxproj b/BeagleIM.xcodeproj/project.pbxproj
index 95286979..be9fa26f 100644
--- a/BeagleIM.xcodeproj/project.pbxproj
+++ b/BeagleIM.xcodeproj/project.pbxproj
@@ -1817,7 +1817,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 178;
+				CURRENT_PROJECT_VERSION = 179;
 				DEVELOPMENT_TEAM = YBEYW6E35C;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1831,7 +1831,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 5.3.5;
+				MARKETING_VERSION = 5.3.6;
 				OTHER_LDFLAGS = "-v";
 				PRODUCT_BUNDLE_IDENTIFIER = org.tigase.messenger.BeagleIM;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1851,7 +1851,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 178;
+				CURRENT_PROJECT_VERSION = 179;
 				DEVELOPMENT_TEAM = YBEYW6E35C;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1865,7 +1865,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 5.3.5;
+				MARKETING_VERSION = 5.3.6;
 				OTHER_LDFLAGS = "-v";
 				PRODUCT_BUNDLE_IDENTIFIER = org.tigase.messenger.BeagleIM;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/BeagleIM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BeagleIM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index e78ecd59..a4320380 100644
--- a/BeagleIM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/BeagleIM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,52 +1,51 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "libsignal",
-        "repositoryURL": "https://github.com/tigase/libsignal",
-        "state": {
-          "branch": null,
-          "revision": "d23d5af0d729cf66b93cea607f3f84a34b9fddfd",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "package": "tigase-logging.swift",
-        "repositoryURL": "https://github.com/tigase/tigase-logging.swift",
-        "state": {
-          "branch": "master",
-          "revision": "382e2e85e64f8b1e3fcb71a996a030bf1b62ecb3",
-          "version": null
-        }
-      },
-      {
-        "package": "tigase-sqlite3.swift",
-        "repositoryURL": "https://github.com/tigase/tigase-sqlite3.swift.git",
-        "state": {
-          "branch": "master",
-          "revision": "d4a563a709df4ba0e05a04cf8ac6f68075c54288",
-          "version": null
-        }
-      },
-      {
-        "package": "TigaseSwift",
-        "repositoryURL": "https://github.com/tigase/tigase-swift",
-        "state": {
-          "branch": "master",
-          "revision": "3bcb9f4e08220a608caac689494d4d187d7804fd",
-          "version": null
-        }
-      },
-      {
-        "package": "TigaseSwiftOMEMO",
-        "repositoryURL": "https://github.com/tigase/tigase-swift-omemo",
-        "state": {
-          "branch": "master",
-          "revision": "d7a32ee1f5558b496543c9980f668a9b7c0d4c6b",
-          "version": null
-        }
+  "originHash" : "5c9666bd5fd2c30f1ff797bf3dca071e41b5c6baf2f50c901324fd64b23834d6",
+  "pins" : [
+    {
+      "identity" : "libsignal",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tigase/libsignal",
+      "state" : {
+        "revision" : "d23d5af0d729cf66b93cea607f3f84a34b9fddfd",
+        "version" : "1.0.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "martin",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tigase/Martin",
+      "state" : {
+        "revision" : "1d70e9e7eb51a7faa500832be6400a39f86083f7",
+        "version" : "3.2.4"
+      }
+    },
+    {
+      "identity" : "martinomemo",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tigase/MartinOMEMO",
+      "state" : {
+        "revision" : "3c162154d646aa258c9a86c0a07655a536e55a94",
+        "version" : "2.2.3"
+      }
+    },
+    {
+      "identity" : "tigase-logging.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tigase/tigase-logging.swift",
+      "state" : {
+        "revision" : "382e2e85e64f8b1e3fcb71a996a030bf1b62ecb3",
+        "version" : "1.0.0"
+      }
+    },
+    {
+      "identity" : "tigase-sqlite3.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tigase/tigase-sqlite3.swift.git",
+      "state" : {
+        "revision" : "da4974f537333e48aeb6b8191cfd1903f2846d40",
+        "version" : "1.0.0"
+      }
+    }
+  ],
+  "version" : 3
 }
diff --git a/BeagleIM/service/XmppService.swift b/BeagleIM/service/XmppService.swift
index de33860e..0f6bd7ff 100644
--- a/BeagleIM/service/XmppService.swift
+++ b/BeagleIM/service/XmppService.swift
@@ -221,6 +221,7 @@ class XmppService {
             if let idx = options.networkProcessorProviders.firstIndex(where: { $0 is SSLProcessorProvider }) {
                 options.networkProcessorProviders.remove(at: idx);
             }
+            options.connectionTimeout = 5 * 60;
             options.networkProcessorProviders.append(account.disableTLS13 ? SSLProcessorProvider(supportedTlsVersions: TLSVersion.TLSv1_2...TLSVersion.TLSv1_2) : SSLProcessorProvider());
         });
 
diff --git a/BeagleIM/ui/AvatarView.swift b/BeagleIM/ui/AvatarView.swift
index 08629191..49b1db53 100644
--- a/BeagleIM/ui/AvatarView.swift
+++ b/BeagleIM/ui/AvatarView.swift
@@ -86,7 +86,7 @@ class AvatarView: NSImageView {
     }
     
     override func draw(_ dirtyRect: NSRect) {
-        let path = NSBezierPath(roundedRect: dirtyRect, xRadius: frame.width/2, yRadius: frame.width/2);
+        let path = NSBezierPath(roundedRect: self.bounds, xRadius: frame.width/2, yRadius: frame.width/2);
         path.addClip();
 
         if self.image != nil {
@@ -96,12 +96,12 @@ class AvatarView: NSImageView {
             (isDark ? NSColor.white : NSColor.darkGray).withAlphaComponent(0.3).setFill();
             path.fill();
 
-            let font = NSFont.systemFont(ofSize: dirtyRect.width * 0.4, weight: .medium);
+            let font = NSFont.systemFont(ofSize: frame.width * 0.4, weight: .medium);
             let textAttr: [NSAttributedString.Key: Any] = [.foregroundColor: NSColor.white.withAlphaComponent(0.9), .font: font];
 
             let textSize = text.size(withAttributes: textAttr)
 
-            text.draw(in: CGRect(x: dirtyRect.midX - textSize.width/2, y: dirtyRect.midY - textSize.height/2, width: textSize.width, height: textSize.height), withAttributes: textAttr);
+            text.draw(in: CGRect(x: bounds.midX - textSize.width/2, y: bounds.midY - textSize.height/2, width: textSize.width, height: textSize.height), withAttributes: textAttr);
         }
     }
     
diff --git a/BeagleIM/ui/AvatarViewWithStatus.swift b/BeagleIM/ui/AvatarViewWithStatus.swift
index 6644a38e..8a32850a 100644
--- a/BeagleIM/ui/AvatarViewWithStatus.swift
+++ b/BeagleIM/ui/AvatarViewWithStatus.swift
@@ -151,7 +151,7 @@ class AvatarViewWithStatus: NSView {
         override func draw(_ dirtyRect: NSRect) {
             if backgroundColor != nil {
                 backgroundColor!.setFill();
-                let ellipse = NSBezierPath.init(roundedRect: dirtyRect, xRadius: dirtyRect.width/2, yRadius: dirtyRect.height/2);
+                let ellipse = NSBezierPath.init(roundedRect: self.bounds, xRadius: frame.width/2, yRadius: frame.height/2);
                 ellipse.fill();
                 ellipse.setClip();