diff --git a/spec/helpers/markdownify_helper_spec.rb b/spec/helpers/markdownify_helper_spec.rb
index 51c7704c7..e5778a9e6 100644
--- a/spec/helpers/markdownify_helper_spec.rb
+++ b/spec/helpers/markdownify_helper_spec.rb
@@ -58,6 +58,14 @@ describe MarkdownifyHelper do
         formatted = markdownify(message)
         formatted.should =~ /hovercard/
       end
+
+      it 'should process text with both a hashtag and a link' do
+        message = Factory.create(:status_message,
+                                 :author => alice.person,
+                                 :text => "Test #tag?\nhttps://joindiaspora.com\n")
+        formatted = markdownify(message)
+        formatted.should == %{<p>Test <a href="/tags/tag" class="tag">#tag</a>?<br>\n<a href="https://joindiaspora.com" target="_blank">https://joindiaspora.com</a></p>\n}
+      end
     end
   end
 end