diff --git a/app/models/spree/shipment_decorator.rb b/app/models/spree/shipment_decorator.rb
deleted file mode 100644
index abb472b..0000000
--- a/app/models/spree/shipment_decorator.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Spree::Shipment.class_eval do
-
-  def self.between(from, to)
-    joins(:order).where('(spree_shipments.updated_at > ? AND spree_shipments.updated_at < ?) OR (spree_orders.updated_at > ? AND spree_orders.updated_at < ?)',from, to, from, to)
-  end
-
-private
-  def send_shipped_email
-    Spree::ShipmentMailer.shipped_email(self).deliver if Spree::Config.send_shipped_email
-  end
-end
diff --git a/app/models/spree/shipment_handler_decorator.rb b/app/models/spree/shipment_handler_decorator.rb
new file mode 100644
index 0000000..c7d3ec1
--- /dev/null
+++ b/app/models/spree/shipment_handler_decorator.rb
@@ -0,0 +1,8 @@
+Spree::ShipmentHandler.class_eval do
+
+  private
+
+    def send_shipped_email
+      Spree::ShipmentMailer.shipped_email(@shipment.id).deliver if Spree::Config.send_shipped_email
+    end
+end