diff --git a/app/controllers/public/chat_controller.rb b/app/controllers/public/chat_controller.rb
index 6187b6a..0536c42 100644
--- a/app/controllers/public/chat_controller.rb
+++ b/app/controllers/public/chat_controller.rb
@@ -28,15 +28,6 @@ class ChatController < PublicController
     end
   end
 
-  def index
-    #presence = current_user.last_chat_status
-    #if presence.blank? or presence == 'chat'
-    #  render :action => 'auto_connect_online'
-    #else
-    #  render :action => 'auto_connect_busy'
-    #end
-  end
-
   def update_presence_status
     if request.xhr?
       current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
diff --git a/app/views/chat/auto_connect_busy.html.erb b/app/views/chat/auto_connect_busy.html.erb
deleted file mode 100644
index 26feb96..0000000
--- a/app/views/chat/auto_connect_busy.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type='text/javascript'>
-  jQuery(function($) {
-     $('#chat-busy').trigger('click');
-  });
-</script>
diff --git a/app/views/chat/auto_connect_online.html.erb b/app/views/chat/auto_connect_online.html.erb
deleted file mode 100644
index 16868be..0000000
--- a/app/views/chat/auto_connect_online.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type='text/javascript'>
-  jQuery(function($) {
-     $('#chat-connect').trigger('click');
-  });
-</script>
diff --git a/app/views/chat/index.html.erb b/app/views/chat/index.html.erb
index b7c1769..aa70b00 100644
--- a/app/views/chat/index.html.erb
+++ b/app/views/chat/index.html.erb
@@ -16,6 +16,18 @@
       var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>;
     </script>
 
+
+  <% presence = current_user.last_chat_status %>
+  <script>
+    jQuery(function($) {
+    <% if presence.blank? or presence == 'chat' %>
+      $('#chat-connect').trigger('click');
+    <% else %>
+      $('#chat-busy').trigger('click');
+    <% end %>
+    });
+  </script>
+
   <div id='chat'>
     <div id='title-bar'>
       <h1 class='title'><%= _("Online") % h(page_title) %>&nbsp;(<span id='friends-online'>0</span>)</h1>
diff --git a/app/views/layouts/chat.html.erb b/app/views/layouts/chat.html.erb
deleted file mode 100644
index fcae464..0000000
--- a/app/views/layouts/chat.html.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
-  <head>
-    <title><%= h page_title %></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <meta name="description" content="<%= @environment.name %>" />
-    <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
-    <%= noosfero_javascript %>
-    <%= javascript_include_tag 'prototype', 'jquery.scrollabletab', 'strophejs-1.0.1/strophe', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', :cache => 'cache/chat' %>
-    <%= noosfero_stylesheets %>
-    <%= stylesheet_link_tag icon_theme_stylesheet_path %>
-    <%= stylesheet_link_tag theme_stylesheet_path %>
-    <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
-    <script type='text/javascript'>
-      var $presence_status_label = {
-        chat: '<%= _('Online') %>',
-        dnd: '<%= _('Busy') %>',
-        '': '<%= _('Offline') %>'
-      };
-      var $own_name = '<%= user.name %>';
-      var $starting_chat_notice = '<%= _("starting chat with %{name}") %>';
-      var $muc_domain = '<%= "conference.#{environment.default_hostname}" %>';
-      var $user_unavailable_error = '<%= _("<strong>ooops!</strong> The message could not be sent because the user is not online") %>';
-      var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>;
-      var $balloon_template = '<div data-who="%{who}" class="message %{who}"><img class="avatar" src="%{avatar_url}"/><% comment_balloon do %><h5 class="%{who}-name">%{name}</h5><span class="time">%{time}</span><p>%{message}</p><% end %></div>';
-    </script>
-  </head>
-  <body id='chat'>
-    <div id='title-bar'>
-      <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
-    </div>
-    <div id='buddy-list'>
-      <div id='environment-logo'>
-        <%= image_tag "#{theme_path}/images/thin-logo.png", :title => environment.name, :alt => environment.name %>
-      </div>
-      <div class='toolbar'>
-        <div id='user-status'><%= user_status_menu('icon-menu-offline', _('Offline')) %></div>
-        <div class='dialog-error' style='display: none'></div>
-      </div>
-      <ul class='buddy-list'>
-        <!-- <li class='offline'><a id='%{jid_id}' class='icon-menu-offline-11' href='#'>%{name}</a></li> -->
-      </ul>
-    </div>
-    <div id='chat-window' class='tabs-bottom'>
-      <div id='tabs'>
-        <ul>
-          <!-- <li class="tab"><a href="#{href}">#{label}</a></li> -->
-        </ul>
-      </div>
-      <!--
-      <div id='#conversation-%{jid_id}' class='conversation'>
-        <div class='history'>
-          <div class='message %{who}'><img class='avatar' src='%{avatar_url}' /><h5 class='%{who}-info'>%{name}</h5><span class='time'>%{time}</span><p>%{message}</p></div>
-        </div>
-        <div class='input-div'>
-          <div class='icon-chat'></div>
-          <textarea type='textarea' data-to='%{jid}'></textarea>
-        </div>
-      </div>
-      -->
-    </div>
-    <%= yield %>
-  </body>
-</html>
diff --git a/public/stylesheets/chat.css b/public/stylesheets/chat.css
index dedbc1e..dbdadd3 100644
--- a/public/stylesheets/chat.css
+++ b/public/stylesheets/chat.css
@@ -1,5 +1,6 @@
 #chat {
   width: 250px;
+  display: none;
 }
 
 #buddy-list {
--
libgit2 0.21.2