diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 5d9a913..8bad792 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -42,6 +42,8 @@ class WikiController < ApplicationController
   helper :watchers
   include Redmine::Export::PDF
 
+  include ActionView::Helpers::SanitizeHelper
+
   # List of pages, sorted alphabetically and by parent (hierarchy)
   def index
     load_pages_for_index
@@ -107,7 +109,7 @@ class WikiController < ApplicationController
         send_data(export, :type => 'text/html', :filename => filename_for_content_disposition("#{@page.title}.html"))
         return
       elsif params[:format] == 'txt'
-        send_data(@content.text, :type => 'text/plain', :filename => filename_for_content_disposition("#{@page.title}.txt"))
+        send_data(strip_tags(@content.text), :type => 'text/plain', :filename => filename_for_content_disposition("#{@page.title}.txt"))
         return
       end
     end
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 723d642..f903c1e 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -47,7 +47,7 @@
 <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
 
 <% if @page.attachments.length > 0 || (@editable && authorize_for('wiki', 'add_attachment')) %>
-<fieldset class="collapsible collapsed">
+<fieldset class="collapsible collapsed<% if @page.attachments.length == 0 %> hide-when-print<% end %>">
   <legend onclick="toggleFieldset(this);"><%= l(:label_attachment_plural) %> (<%= @page.attachments.length %>)</legend>
   <div style="display: none;">
 
diff --git a/public/themes/circlepro/images/logo_print.png b/public/themes/circlepro/images/logo_print.png
new file mode 100644
index 0000000..f04803d
Binary files /dev/null and b/public/themes/circlepro/images/logo_print.png differ
diff --git a/public/themes/circlepro/stylesheets/application.css b/public/themes/circlepro/stylesheets/application.css
index f7810c2..7299115 100644
--- a/public/themes/circlepro/stylesheets/application.css
+++ b/public/themes/circlepro/stylesheets/application.css
@@ -27,6 +27,7 @@
  *	21. OBJECTS
  *	22. RESPONSIVE
  *	23. SELECT2
+ *  24. PRINTING
  *
  * Based on Circle Theme by Kirill Bezrukov.
  */
@@ -706,6 +707,7 @@ body.action-login #content {
 	-moz-background-size: cover;
 	-o-background-size: cover;
 	background-size: cover;
+	min-height: 525px;
 	padding: 6em 2.35em;
 }
 #login-form {
@@ -1577,3 +1579,46 @@ div.details { padding: 20px !important; }
 	border: 1px solid #2996cc;
 	border-radius: 3px;
 }
+
+/**********************************************************/
+/* 24. PRINTING */
+/**********************************************************/
+
+@media print {
+	@page {
+		size: A4;
+		margin: 1cm;
+	}
+	html, body {
+		margin: 0;
+		padding: 0;
+		background: #fff;
+		-webkit-print-color-adjust: exact;
+	}
+	table tr td,
+	table tr th {
+		page-break-inside: avoid;
+	}
+	#wrapper3,
+	#main,
+	#header {
+		background: #fff;
+	}
+	#header {
+		display: block;
+	}
+	#header h1 {
+		color: #3d454c;
+		padding-left: 0;
+	}
+	#wrapper-header {
+		background: url(../images/logo_print.png) no-repeat 0 0;
+	}	
+	#quick-search {
+		display: none;
+	}
+	div#content {
+		width: 100%;
+		padding: 0;
+	}
+}