diff --git a/app/logical/downloads/rewrite_strategies/base.rb b/app/logical/downloads/rewrite_strategies/base.rb
index 732fdb09d..f64805ab1 100644
--- a/app/logical/downloads/rewrite_strategies/base.rb
+++ b/app/logical/downloads/rewrite_strategies/base.rb
@@ -5,6 +5,8 @@
 module Downloads
   module RewriteStrategies
     class Base
+      attr_reader :url
+
       def initialize(url = nil)
         @url = url
       end
diff --git a/app/logical/downloads/rewrite_strategies/pawoo.rb b/app/logical/downloads/rewrite_strategies/pawoo.rb
index 0f1f7941a..3a0e3690e 100644
--- a/app/logical/downloads/rewrite_strategies/pawoo.rb
+++ b/app/logical/downloads/rewrite_strategies/pawoo.rb
@@ -1,17 +1,13 @@
 module Downloads
   module RewriteStrategies
     class Pawoo < Base
-      attr_accessor :url, :source
-
-      def initialize(url)
-        @url  = url
-      end
-
       def rewrite(url, headers, data = {})
-        if PawooApiClient::Status.is_match?(url)
-          client = PawooApiClient.new
-          response = client.get_status(url)
-          url = response.image_url
+        if Sources::Strategies::Pawoo.url_match?(url)
+          source = Sources::Strategies::Pawoo.new(url)
+          source.get
+          url = source.image_url
+        elsif url =~ %r!\Ahttps?://img\.pawoo\.net/media_attachments/files/(\d+/\d+/\d+)/small/([a-z0-9]+\.\w+)\z!i
+          url = "https://img.pawoo.net/media_attachments/files/#{$1}/original/#{$2}"
         end
 
         return [url, headers, data]