diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index e02efc7d85e..37dab75c7e1 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -238,3 +238,7 @@ pre.onebox code {
 .onebox-body .github-content-right{
   margin-left:100px;
 }
+
+.twitterstatus .onebox-body p {
+  white-space: pre-wrap;
+}
diff --git a/db/migrate/20150709021818_add_like_count_to_post_menu.rb b/db/migrate/20150709021818_add_like_count_to_post_menu.rb
new file mode 100644
index 00000000000..a12a166f417
--- /dev/null
+++ b/db/migrate/20150709021818_add_like_count_to_post_menu.rb
@@ -0,0 +1,10 @@
+class AddLikeCountToPostMenu < ActiveRecord::Migration
+  def up
+    execute <<SQL
+UPDATE site_settings
+SET value = replace(value, 'like', 'like-count|like')
+WHERE name = 'post_menu'
+AND value NOT LIKE '%like-count%'
+SQL
+  end
+end