diff --git a/.gitignore b/.gitignore
index ed9cd99..a6fedb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 .tmp*
 .htaccess
 .settings/*
+*~
+*.orig
+git-create-branch-github.sh
+git-create-branch-origin.sh
+framework.config.php
+.project
diff --git a/features/cerberusweb.core/strings.xml b/features/cerberusweb.core/strings.xml
index 404648f..a46ac9b 100644
--- a/features/cerberusweb.core/strings.xml
+++ b/features/cerberusweb.core/strings.xml
@@ -917,6 +917,9 @@
 		<tu tuid='display.convo.full_headers'>
 			<tuv xml:lang="en_US"><seg>full headers</seg></tuv>
 		</tu>
+		<tu tuid='display.convo.hide_headers'>
+			<tuv xml:lang="en_US"><seg>Hide headers</seg></tuv>
+		</tu>
 		<tu tuid='display.convo.no_messages'>
 			<tuv xml:lang="en_US"><seg>No messages on ticket.</seg></tuv>
 		</tu>
diff --git a/features/cerberusweb.core/templates/display/modules/conversation/message.tpl b/features/cerberusweb.core/templates/display/modules/conversation/message.tpl
index ddae4f0..8d1cda4 100644
--- a/features/cerberusweb.core/templates/display/modules/conversation/message.tpl
+++ b/features/cerberusweb.core/templates/display/modules/conversation/message.tpl
@@ -62,8 +62,14 @@
       
       {if $expanded}
       <div style="margin:2px;margin-left:10px;">
-      	 <a href="javascript:;" onclick="toggleDiv('{$message->id}sh');toggleDiv('{$message->id}h');">{$translate->_('display.convo.full_headers')|lower}</a>
-      	 | <a href="#{$message->id}act">{$translate->_('display.convo.skip_to_bottom')|lower}</a>
+      	 <div id="{$message->id}fh" style="display:block;">
+				 <a href="javascript:;" onclick="toggleDiv('{$message->id}sh');toggleDiv('{$message->id}h');toggleDiv('{$message->id}fh');toggleDiv('{$message->id}hh');">{$translate->_('display.convo.full_headers')|lower}</a>
+				 | <a href="#{$message->id}act">{$translate->_('display.convo.skip_to_bottom')|lower}</a>
+				 </div>
+      	 <div id="{$message->id}hh" style="display:none;">
+				 <a href="javascript:;" onclick="toggleDiv('{$message->id}sh');toggleDiv('{$message->id}h');toggleDiv('{$message->id}fh');toggleDiv('{$message->id}hh');">{$translate->_('display.convo.hide_headers')|lower}</a>
+				 | <a href="#{$message->id}act">{$translate->_('display.convo.skip_to_bottom')|lower}</a>
+				 </div>
       </div>
       {/if}