diff --git a/package.xml b/package.xml
index 476b275..df7cda5 100644
--- a/package.xml
+++ b/package.xml
@@ -31,7 +31,6 @@
option.xml
pagemenu.xml
eventListener.xml
- templatelistener.xml
acloptions.xml
acpMenu.xml
userGroupOption.xml
@@ -46,7 +45,6 @@
option.xml
pagemenu.xml
eventListener.xml
- templatelistener.xml
acloptions.xml
acpMenu.xml
userGroupOption.xml
diff --git a/template/chat.tpl b/template/chat.tpl
index 718ec58..c5f82b7 100755
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -90,35 +90,8 @@
-{capture assign='sidebar'}
-
-{/capture}
+{capture assign='sidebar'}{include file='chatSidebar'}{/capture}
+{capture assign='headerNavigation'}{include file='chatNavigationInclude'}{/capture}
{include file='header' sandbox=false sidebarOrientation='right'}
diff --git a/template/chatNavigationInclude.tpl b/template/chatNavigationInclude.tpl
index 07e203a..7c834e9 100644
--- a/template/chatNavigationInclude.tpl
+++ b/template/chatNavigationInclude.tpl
@@ -1,4 +1,10 @@
-{if $templateName == 'chat'}
-
{lang}wcf.chat.protocol{/lang}
-
{lang}wcf.chat.title{/lang}
-{/if}
\ No newline at end of file
+
+
+ {lang}wcf.chat.protocol{/lang}
+
+
+
+
+ {lang}wcf.chat.title{/lang}
+
+
\ No newline at end of file
diff --git a/templatelistener.xml b/templatelistener.xml
deleted file mode 100644
index e05fa92..0000000
--- a/templatelistener.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- user
- header
- headerNavigation
-
-
-
-
\ No newline at end of file