diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index bcd6622a7..16a640267 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -17,7 +17,7 @@
 <!-- page specific tags -->
 <%= yield :header_tags -%>
 </head>
-<body class="<%= body_css_classes %>">
+<body class="<%= body_css_classes %>" data-text-formatting="<%= Setting.text_formatting %>">
 <%= call_hook :view_layouts_base_body_top %>
 <div id="wrapper">
 
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index 45cbc08ae..d7c6741c9 100644
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_test.rb
@@ -117,6 +117,16 @@ class WelcomeControllerTest < Redmine::ControllerTest
     assert_select 'body.textarea-proportional'
   end
 
+  def test_data_text_setting_attribute
+    formats = %w(textile common_mark)
+    formats.each do |format|
+      with_settings text_formatting: format do
+        get :index
+        assert_select 'body[data-text-formatting=?]', format
+      end
+    end
+  end
+
   def test_logout_link_should_post
     @request.session[:user_id] = 2
 
