     (fx/merge cofx
               {:db (update db :mailserver/current-request dissoc :attemps)}
               (change-mailserver))
-    (when-let [mailserver (get-mailserver-when-ready cofx)]
-      (let [{:keys [topics from to cursor] :as request} (get db :mailserver/current-request)
+    (if-let [mailserver (get-mailserver-when-ready cofx)]
+      (let [{:keys [topics from to cursor limit] :as request} (get db :mailserver/current-request)
             web3 (:web3 db)]
-        (log/info "mailserver: message request " request-id "expired for mailserver topic" topics "from" from "to" to "cursor" cursor)
+        (log/info "mailserver: message request " request-id "expired for mailserver topic" topics "from" from "to" to "cursor" cursor "limit" (decrease-limit))
         {:db (update-in db [:mailserver/current-request :attemps] inc)
-         :mailserver/request-messages {:web3    web3
-                                       :mailserver   mailserver
-                                       :request request}}))))
+         :mailserver/set-limit (decrease-limit)
+         :mailserver/request-messages {:web3 web3
+                                       :mailserver mailserver
+                                       :request (assoc request :limit (decrease-limit))}})
+      {:mailserver/set-limit (decrease-limit)})))
 
 (fx/defn initialize-mailserver
   [cofx custom-mailservers]
   (fx/merge cofx
+            {:mailserver/set-limit default-limit}
             (add-custom-mailservers custom-mailservers)
             (set-current-mailserver)))
 

 :mailserver/update-mailservers
 (fn [enodes]
   (update-mailservers! enodes)))

(defn mark-trusted-peer! [web3 enode]
  (.markTrustedPeer (transport.utils/shh web3)

  (when (accounts.db/logged-in? cofx)
    (let [error (:errorMessage event)]
      (if (empty? error)
        (fx/merge
         cofx
         {:mailserver/set-limit (increase-limit)}
         (update-mailserver-topics {:request-id (:requestID event)
                                    :cursor     (:cursor event)}))

        (handle-request-error cofx error)))))

(fx/defn show-request-error-popup
