diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
index 84def0f0a..e3d93cdb1 100644
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@@ -1,4 +1,5 @@
 require File.join(Rails.root, 'lib/webfinger')
+require File.join(Rails.root, 'lib/diaspora/parser')
 
 module Diaspora
   module UserModules
diff --git a/lib/tasks/resque.rake b/lib/tasks/resque.rake
index 9f413d6c6..ad2539beb 100644
--- a/lib/tasks/resque.rake
+++ b/lib/tasks/resque.rake
@@ -1,3 +1,7 @@
 require 'resque/tasks'
-task "resque:setup" => :environment
+task "resque:setup" => :environment do
+  Dir[File.join(Rails.root, 'app', 'uploaders', '*.rb')].each { |file| require file }
+  Dir[File.join(Rails.root, 'app', 'models', '*.rb')].each { |file| require file }
+  Rails.logger.info("event=resque_setup rails_env=#{Rails.env}")
+end