diff --git a/app/logical/current_user.rb b/app/logical/current_user.rb
index d40fe4ee5..769d16fc3 100644
--- a/app/logical/current_user.rb
+++ b/app/logical/current_user.rb
@@ -1,5 +1,5 @@
 class CurrentUser
-  def self.scoped(user, ip_addr)
+  def self.scoped(user, ip_addr = "127.0.0.1")
     old_user = self.user
     old_ip_addr = self.ip_addr
 
diff --git a/app/models/post.rb b/app/models/post.rb
index f5f70b0a7..0345bf874 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1282,14 +1282,18 @@ class Post < ActiveRecord::Base
     end
 
     def update_iqdb_async
-      Danbooru.config.all_server_hosts.each do |host|
-        delay(:queue => host).update_iqdb
+      if Danbooru.config.iqdb_hostname_and_port
+        Danbooru.config.all_server_hosts.each do |host|
+          delay(:queue => host).update_iqdb
+        end
       end
     end
 
     def remove_iqdb_async
-      Danbooru.config.all_server_hosts.each do |host|
-        Post.delay(:queue => host).remove_iqdb(id)
+      if Danbooru.config.iqdb_hostname_and_port
+        Danbooru.config.all_server_hosts.each do |host|
+          Post.delay(:queue => host).remove_iqdb(id)
+        end
       end
     end
 
diff --git a/test/unit/dmail_test.rb b/test/unit/dmail_test.rb
index a8a75bdc5..fbb768930 100644
--- a/test/unit/dmail_test.rb
+++ b/test/unit/dmail_test.rb
@@ -92,9 +92,16 @@ class DmailTest < ActiveSupport::TestCase
 
     should "notify the recipient he has mail" do
       dmail = FactoryGirl.create(:dmail, :owner => @user)
-      assert(dmail.to(true).has_mail?)
-      dmail.mark_as_read!
-      assert(!dmail.to(true).has_mail?)
+      recipient = dmail.to
+      recipient.reload
+      assert(recipient.has_mail?)
+
+      CurrentUser.scoped(recipient) do
+        dmail.mark_as_read!
+      end
+
+      recipient.reload
+      assert(!recipient.has_mail?)
     end
   end
 end