diff --git a/app/models/service.rb b/app/models/service.rb
index cb1d776ac..e6de0c1df 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -16,6 +16,7 @@ class Service
   timestamps!
 
   def public_message(post, length, url = "")
+    url = "" if post.respond_to?(:photos) && post.photos.count == 0
     space_for_url = url.blank? ? 0 : (url.length + 1)
     truncated = truncate(post.message, :length => (length - space_for_url))
     truncated = "#{truncated} #{url}" unless url.blank?
diff --git a/app/models/services/twitter.rb b/app/models/services/twitter.rb
index e7f91e6ec..aeecf8c0c 100644
--- a/app/models/services/twitter.rb
+++ b/app/models/services/twitter.rb
@@ -1,6 +1,6 @@
 class Services::Twitter < Service
   MAX_CHARACTERS = 140
-<D-F>url
+
   def post(post, url='')
     Rails.logger.debug("event=post_to_service type=twitter sender_id=#{self.user_id}")
     message = public_message(post, url)
diff --git a/app/models/user.rb b/app/models/user.rb
index cb4758157..0472ee045 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -159,7 +159,7 @@ class User
   def post_to_services(post, url)
   if post.public && post.respond_to?(:message)
       self.services.each do |service|
-        service.post(post.message)
+        service.post(post, url)
       end
     end
   end