         mailserver-removed?
         (connect-to-mailserver cofx)))))
 
-(def limit 2000)
-
 (defn adjust-request-for-transit-time
   [from]
   (let [ttl               (:ttl protocol/whisper-opts)

              " topics " topics
              " from " actual-from
              " cursor " cursor
              " limit " limit
              " to   " to)
    (.requestMessages (transport.utils/shh web3)
                      (clj->js {:topics         topics
                                :mailServerPeer address
                                :symKeyID       sym-key-id
                                :timeout        request-timeout
                                :limit          limit
                                :cursor         cursor
                                :from           actual-from
                                :to             to})

  (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
