diff --git a/app/models/person.rb b/app/models/person.rb
index d2afb6966..9289703e5 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -150,6 +150,9 @@ class Person < ActiveRecord::Base
   def remote?
     owner_id.nil?
   end
+  def local?
+    !remote?
+  end
 
   def as_json(opts={})
     {
diff --git a/lib/postzord/dispatch.rb b/lib/postzord/dispatch.rb
index e6ec93fd0..6cbc8f3d7 100644
--- a/lib/postzord/dispatch.rb
+++ b/lib/postzord/dispatch.rb
@@ -22,13 +22,13 @@ class Postzord::Dispatch
     unless @subscribers == nil
       remote_people, local_people = @subscribers.partition{ |person| person.owner_id.nil? }
 
-      if @object.is_a?(Comment)
+      if @object.is_a?(Comment) && @sender.owns?(@object.post)
         user_ids = [*local_people].map{|x| x.owner_id }
         local_users = User.where(:id => user_ids)
-        self.socket_and_notify_users(local_users)
-      end
-
-      unless @object.is_a?(Comment) && @sender.owns?(@object.post)
+        self.notify_users(local_users)
+        local_users << @sender if @object.person.local?
+        self.socket_to_users(local_users)
+      else
         self.deliver_to_local(local_people)
       end
 
@@ -71,12 +71,21 @@ class Postzord::Dispatch
   end
 
   def socket_and_notify_users(users)
+    notify_users(users)
+    socket_to_users(users)
+  end
+
+  def notify_users(users)
+    users.each do |user|
+      Resque.enqueue(Job::NotifyLocalUsers, user.id, @object.class.to_s, @object.id, @object.person_id)
+    end
+  end
+  def socket_to_users(users)
     socket = @object.respond_to?(:socket_to_user)
     users.each do |user|
       if socket
         @object.socket_to_user(user)
       end
-      Resque.enqueue(Job::NotifyLocalUsers, user.id, @object.class.to_s, @object.id, @sender_person.id)
     end
   end
 end
diff --git a/spec/helper_methods.rb b/spec/helper_methods.rb
index 971b2067d..89c02ec43 100644
--- a/spec/helper_methods.rb
+++ b/spec/helper_methods.rb
@@ -8,6 +8,9 @@ module HelperMethods
     Mocha::Mockery.instance.stubba.unstub_all
   end
 
+  def connect_users_with_aspects(u1,u2)
+    connect_users(u1, u1.aspects.first, u2, u2.aspects.first)
+  end
   def connect_users(user1, aspect1, user2, aspect2)
     Contact.create!(:user => user1,
                     :person => user2.person,
diff --git a/spec/lib/postzord/dispatch_spec.rb b/spec/lib/postzord/dispatch_spec.rb
index db4d0c6fe..a85f9f134 100644
--- a/spec/lib/postzord/dispatch_spec.rb
+++ b/spec/lib/postzord/dispatch_spec.rb
@@ -48,7 +48,7 @@ describe Postzord::Dispatch do
 
   context 'instance methods' do
     before do
-      @local_user = Factory(:user)
+      @local_user = eve
       @subscribers << @local_user.person
       @remote_people, @local_people = @subscribers.partition{ |person| person.owner_id.nil? }
       @sm.stub!(:subscribers).and_return @subscribers
@@ -74,34 +74,139 @@ describe Postzord::Dispatch do
         @zord.post
       end
 
-      context 'passed a comment' do
+      context "comments" do
         before do
-          comment = @local_user.comment "yo", :on => Factory(:status_message)
-          comment.should_receive(:subscribers).and_return([@local_user.person])
-          @mailman = Postzord::Dispatch.new(@user, comment)
-        end
-        it 'calls socket_to_users with the local users' do
-          @mailman.should_receive(:socket_and_notify_users)
-          @mailman.post
+          @local_luke = Factory(:user_with_aspect, :username => "luke")
+          @local_leia = Factory(:user_with_aspect, :username => "leia")
+          @remote_raphael = Factory(:person, :diaspora_handle => "raphael@remote.net")
+          connect_users_with_aspects(@local_luke, @local_leia)
+          @local_leia.activate_contact(@remote_raphael, @local_leia.aspects.first)
+          @local_luke.activate_contact(@remote_raphael, @local_luke.aspects.first)
         end
+        context "local luke's post is commented on by" do
+          before do
+            @post = @local_luke.post(:status_message, :message => "hello", :to => @local_luke.aspects.first)
+          end
+          context "local leia" do
+            before do
+              @comment = @local_leia.build_comment "yo", :on => @post
+              @comment.save
+            end
+            context "local leia's mailman" do
+              before do
+                @mailman = Postzord::Dispatch.new(@local_leia, @comment)
+              end
+              it 'calls deliver_to_local with local_luke' do
+                @mailman.should_receive(:deliver_to_local).with([@local_luke.person])
+                @mailman.post
+              end
+              it 'calls deliver_to_remote with nobody' do
+                @mailman.should_receive(:deliver_to_remote).with([])
+                @mailman.post
+              end
+              it 'does not call socket_to_users' do
+                @mailman.should_not_receive(:socket_to_users)
+                @mailman.post
+              end
+              it 'does not call notify_users' do
+                @mailman.should_not_receive(:notify_users)
+                @mailman.post
+              end
+            end
+            context "local luke's mailman" do
+              before do
+                @mailman = Postzord::Dispatch.new(@local_luke, @comment)
+              end
+              it 'does not call deliver_to_local' do
+                @mailman.should_not_receive(:deliver_to_local)
+                @mailman.post
+              end
+              it 'calls deliver_to_remote with remote raphael' do
+                @mailman.should_receive(:deliver_to_remote).with([@remote_raphael])
+                @mailman.post
+              end
+              it 'calls socket_to_users' do
+                @mailman.should_receive(:socket_to_users).with([@local_leia, @local_luke])
+                @mailman.post
+              end
+              it 'calls notify_users' do
+                @mailman.should_receive(:notify_users).with([@local_leia])
+                @mailman.post
+              end
+            end
 
-        context 'local recipients' do
-          it 'gets called if not the post owner' do
-            @mailman.stub!(:socket_and_notify_users)
-            @mailman.should_receive(:deliver_to_local)
+          end
+          context "remote raphael" do
+            before do
+              @comment = Factory.build(:comment, :person => @remote_raphael, :post => @post)
+              @comment.save
+              @mailman = Postzord::Dispatch.new(@local_luke, @comment)
+            end
+            it 'does not call deliver_to_local' do
+              @mailman.should_not_receive(:deliver_to_local)
+              @mailman.post
+            end
+            it 'calls deliver_to_remote with remote_raphael' do
+              @mailman.should_receive(:deliver_to_remote).with([@remote_raphael])
+              @mailman.post
+            end
+            it 'calls socket_to_users' do
+              @mailman.should_receive(:socket_to_users).with([@local_leia])
+              @mailman.post
+            end
+            it 'calls notify_users' do
+              @mailman.should_receive(:notify_users).with([@local_leia])
+              @mailman.post
+            end
+          end
+          context "local luke" do
+            before do
+              @comment = @local_luke.build_comment "yo", :on => @post
+              @comment.save
+              @mailman = Postzord::Dispatch.new(@local_luke, @comment)
+            end
+            it 'does not call deliver_to_local' do
+              @mailman.should_not_receive(:deliver_to_local)
+              @mailman.post
+            end
+            it 'calls deliver_to_remote with remote_raphael' do
+              @mailman.should_receive(:deliver_to_remote).with([@remote_raphael])
+              @mailman.post
+            end
+            it 'calls socket_to_users' do
+              @mailman.should_receive(:socket_to_users).with([@local_leia, @local_luke])
+              @mailman.post
+            end
+            it 'calls notify_users' do
+              @mailman.should_receive(:notify_users).with([@local_leia])
+              @mailman.post
+            end
+          end
+        end
+        context "remote raphael's post is commented on by local luke" do
+          before do
+            @post = Factory(:status_message, :person => @remote_raphael)
+            @comment = @local_luke.build_comment "yo", :on => @post
+            @comment.save
+            @mailman = Postzord::Dispatch.new(@local_luke, @comment)
+          end
+          it 'calls deliver_to_remote with remote_raphael' do
+            @mailman.should_receive(:deliver_to_remote).with([@remote_raphael])
+            @mailman.post
+          end
+          it 'calls deliver_to_local with nobody' do
+            @mailman.should_receive(:deliver_to_local).with([])
+            @mailman.post
+          end
+          it 'does not call socket_to_users' do
+            @mailman.should_not_receive(:socket_to_users)
+            @mailman.post
+          end
+          it 'does not call notify_users' do
+            @mailman.should_not_receive(:notify_users)
             @mailman.post
           end
 
-          it 'does not get called if not the post owner' do
-            status = @user.build_post(:status_message, :message => 'hey', :to => @user.aspects.first)
-
-            comment = @user.comment "yo", :on => status
-            comment.should_receive(:subscribers).and_return([@local_user.person])
-            mailman2 = Postzord::Dispatch.new(@user, comment)
-            mailman2.stub!(:socket_and_notify_users)
-            mailman2.should_not_receive(:deliver_to_local)
-            mailman2.post
-          end
         end
       end
     end
@@ -176,12 +281,12 @@ describe Postzord::Dispatch do
         users = [@user]
         z = Postzord::Dispatch.new(@user, f)
         z.instance_variable_get(:@object).should_receive(:socket_to_user).once
-        z.send(:socket_and_notify_users, users)
+        z.send(:socket_to_users, users)
       end
 
-      it 'queues a Job::NotifyLocalUsers jobs' do
+      it 'queues Job::NotifyLocalUsers jobs' do
         @zord.instance_variable_get(:@object).should_receive(:socket_to_user).and_return(false)
-        Resque.should_receive(:enqueue).with(Job::NotifyLocalUsers, @local_user.id, @sm.class.to_s, @sm.id, anything)
+        Resque.should_receive(:enqueue).with(Job::NotifyLocalUsers, @local_user.id, @sm.class.to_s, @sm.id, @sm.person.id)
         @zord.send(:socket_and_notify_users, [@local_user])
       end
     end