diff --git a/addons/im/Gruntfile.js b/addons/im/Gruntfile.js
new file mode 100644
index 00000000000..3d4a7f5aa50
--- /dev/null
+++ b/addons/im/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function(grunt) {
+
+    grunt.initConfig({
+        jshint: {
+            src: ['static/js/*.js'],
+            options: {
+                sub: true, //[] instead of .
+                evil: true, //eval
+                laxbreak: true, //unsafe line breaks
+            },
+        },
+    });
+
+    grunt.loadNpmTasks('grunt-contrib-jshint');
+
+    grunt.registerTask('test', []);
+
+    grunt.registerTask('default', ['jshint']);
+
+};
\ No newline at end of file
diff --git a/addons/im/__openerp__.py b/addons/im/__openerp__.py
index 61baece6c81..32a88d6734c 100644
--- a/addons/im/__openerp__.py
+++ b/addons/im/__openerp__.py
@@ -18,7 +18,7 @@ chat in real time. It support several chats in parallel.
         'security/im_security.xml',
     ],
     'depends' : ['base', 'web'],
-    'js': ['static/src/js/*.js'],
+    'js': ['static/src/js/im.js'],
     'css': ['static/src/css/*.css'],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/im/package.json b/addons/im/package.json
new file mode 100644
index 00000000000..3ce6500a077
--- /dev/null
+++ b/addons/im/package.json
@@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "grunt": "*",
+    "grunt-contrib-jshint": "*"
+  }
+}
diff --git a/addons/im_livechat/static/ext/static/css/livesupport.css b/addons/im/static/src/css/im_common.css
similarity index 100%
rename from addons/im_livechat/static/ext/static/css/livesupport.css
rename to addons/im/static/src/css/im_common.css
diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js
new file mode 100644
index 00000000000..5307cb422fa
--- /dev/null
+++ b/addons/im/static/src/js/im_common.js
@@ -0,0 +1,440 @@
+
+/*
+    Dependencies: openerp, underscore, jquery
+
+    This file must compile in EcmaScript 3 and work in IE7.
+
+    Prerequisites to use this module:
+    - load the im_common.xml qweb template into openerp.qweb
+    - implement all the stuff defined later
+*/
+
+(function() {
+
+function declare($, _, openerp) {
+    /* jshint es3: true */
+    "use strict";
+
+    var im_common = {};
+
+    // like underscore's noConflit() to easily create an amd wrapper
+    var tmp_im_common = window.im_common;
+    im_common.no_conflict = function() {
+        window.im_common = tmp_im_common;
+        return im_common;
+    };
+    window.im_common = im_common;
+
+    /*
+        All of this must be defined to use this module
+    */
+    _.extend(im_common, {
+        to_url: function(file) {
+            throw new Error("Not implemented");
+        },
+        notification: function(message) {
+            throw new Error("Not implemented");
+        },
+        defaultInputPlaceholder: null,
+        userName: null,
+        connection: null
+    });
+
+    var _t = openerp._t;
+    
+    var im_common = {};
+
+    var ERROR_DELAY = 5000;
+
+    im_common.ChatButton = openerp.Widget.extend({
+        className: "openerp_style oe_chat_button",
+        events: {
+            "click": "click"
+        },
+        init: function(parent, channel, options) {
+            this._super(parent);
+            this.channel = channel;
+            this.options = options;
+            this.text = options.buttonText;
+        },
+        start: function() {
+            this.$().append(openerp.qweb.render("chatButton", {widget: this}));
+        },
+        click: function() {
+            if (! this.manager) {
+                this.manager = new im_common.ConversationManager(null);
+                this.activated_def = this.manager.start_polling();
+            }
+            var def = $.Deferred();
+            $.when(this.activated_def).then(function() {
+                def.resolve();
+            }, function() {
+                def.reject();
+            });
+            setTimeout(function() {
+                def.reject();
+            }, 5000);
+            def.then(_.bind(this.chat, this), function() {
+                im_common.notification(_t("It seems the connection to the server is encountering problems, please try again later."));
+            });
+        },
+        chat: function() {
+            var self = this;
+            if (this.manager.conversations.length > 0)
+                return;
+            im_common.connection.model("im_livechat.channel").call("get_available_user", [this.channel]).then(function(user_id) {
+                if (! user_id) {
+                    im_common.notification(_t("None of our collaborators seems to be available, please try again later."));
+                    return;
+                }
+                self.manager.ensure_users([user_id]).then(function() {
+                    var conv = self.manager.activate_user(self.manager.get_user(user_id), true);
+                    if (self.options.defaultMessage) {
+                        conv.received_message({message: self.options.defaultMessage, 
+                            date: openerp.datetime_to_str(new Date())});
+                    }
+                });
+            });
+        }
+    });
+
+    im_common.ImUser = openerp.Class.extend(openerp.PropertiesMixin, {
+        init: function(parent, user_rec) {
+            openerp.PropertiesMixin.init.call(this, parent);
+            user_rec.image_url = im_common.to_url("im/static/src/img/avatar/avatar.jpeg");
+            if (user_rec.image)
+                user_rec.image_url = "data:image/png;base64," + user_rec.image;
+            this.set(user_rec);
+            this.set("watcher_count", 0);
+            this.on("change:watcher_count", this, function() {
+                if (this.get("watcher_count") === 0)
+                    this.destroy();
+            });
+        },
+        destroy: function() {
+            this.trigger("destroyed");
+            openerp.PropertiesMixin.destroy.call(this);
+        },
+        add_watcher: function() {
+            this.set("watcher_count", this.get("watcher_count") + 1);
+        },
+        remove_watcher: function() {
+            this.set("watcher_count", this.get("watcher_count") - 1);
+        }
+    });
+
+    im_common.ConversationManager = openerp.Class.extend(openerp.PropertiesMixin, {
+        init: function(parent) {
+            openerp.PropertiesMixin.init.call(this, parent);
+            this.set("right_offset", 0);
+            this.conversations = [];
+            this.users = {};
+            this.on("change:right_offset", this, this.calc_positions);
+            this.set("window_focus", true);
+            this.set("waiting_messages", 0);
+            this.focus_hdl = _.bind(function() {
+                this.set("window_focus", true);
+            }, this);
+            $(window).bind("focus", this.focus_hdl);
+            this.blur_hdl = _.bind(function() {
+                this.set("window_focus", false);
+            }, this);
+            $(window).bind("blur", this.blur_hdl);
+            this.on("change:window_focus", this, this.window_focus_change);
+            this.window_focus_change();
+            this.on("change:waiting_messages", this, this.messages_change);
+            this.messages_change();
+            this.create_ting();
+            this.activated = false;
+            this.users_cache = {};
+            this.last = null;
+            this.unload_event_handler = _.bind(this.unload, this);
+        },
+        start_polling: function() {
+            var self = this;
+
+            var uuid = localStorage["oe_livesupport_uuid"];
+            var def = $.when(uuid);
+
+            if (! uuid) {
+                def = im_common.connection.rpc("/longpolling/im/gen_uuid", {});
+            }
+            return def.then(function(uuid) {
+                localStorage["oe_livesupport_uuid"] = uuid;
+                return im_common.connection.model("im.user").call("get_by_user_id", [uuid]);
+            }).then(function(my_id) {
+                self.my_id = my_id["id"];
+                return im_common.connection.model("im.user").call("assign_name", [uuid, im_common.userName]);
+            }).then(function() {
+                return self.ensure_users([self.my_id]);
+            }).then(function() {
+                var me = self.users_cache[self.my_id];
+                delete self.users_cache[self.my_id];
+                self.me = me;
+                me.set("name", "You");
+                return im_common.connection.rpc("/longpolling/im/activated", {});
+            }).then(function(activated) {
+                if (activated) {
+                    self.activated = true;
+                    $(window).on("unload", self.unload_event_handler);
+                    self.poll();
+                } else {
+                    return $.Deferred().reject();
+                }
+            });
+        },
+        unload: function() {
+            im_common.connection.model("im.user").call("im_disconnect", [], {uuid: this.me.get("uuid"), context: {}});
+        },
+        ensure_users: function(user_ids) {
+            var no_cache = {};
+            _.each(user_ids, function(el) {
+                if (! this.users_cache[el])
+                    no_cache[el] = el;
+            }, this);
+            var self = this;
+            if (_.size(no_cache) === 0)
+                return $.when();
+            else
+                return im_common.connection.model("im.user").call("read", [_.values(no_cache), []]).then(function(users) {
+                    self.add_to_user_cache(users);
+                });
+        },
+        add_to_user_cache: function(user_recs) {
+            _.each(user_recs, function(user_rec) {
+                if (! this.users_cache[user_rec.id]) {
+                    var user = new im_common.ImUser(this, user_rec);
+                    this.users_cache[user_rec.id] = user;
+                    user.on("destroyed", this, function() {
+                        delete this.users_cache[user_rec.id];
+                    });
+                }
+            }, this);
+        },
+        get_user: function(user_id) {
+            return this.users_cache[user_id];
+        },
+        poll: function() {
+            console.debug("live support beggin polling");
+            var self = this;
+            var user_ids = _.map(this.users_cache, function(el) {
+                return el.get("id");
+            });
+            im_common.connection.rpc("/longpolling/im/poll", {
+                last: this.last,
+                users_watch: user_ids,
+                db: im_common.connection.database,
+                uid: im_common.connection.userId,
+                password: im_common.connection.password,
+                uuid: self.me.get("uuid")
+            }).then(function(result) {
+                _.each(result.users_status, function(el) {
+                    if (self.get_user(el.id))
+                        self.get_user(el.id).set(el);
+                });
+                self.last = result.last;
+                var user_ids = _.pluck(_.pluck(result.res, "from_id"), 0);
+                self.ensure_users(user_ids).then(function() {
+                    _.each(result.res, function(mes) {
+                        var user = self.get_user(mes.from_id[0]);
+                        self.received_message(mes, user);
+                    });
+                    self.poll();
+                });
+            }, function() {
+                setTimeout(_.bind(self.poll, self), ERROR_DELAY);
+            });
+        },
+        get_activated: function() {
+            return this.activated;
+        },
+        create_ting: function() {
+            if (typeof(Audio) === "undefined") {
+                this.ting = {play: function() {}};
+                return;
+            }
+            this.ting = new Audio(new Audio().canPlayType("audio/ogg; codecs=vorbis") ?
+                im_common.to_url("im/static/src/audio/Ting.ogg") :
+                im_common.to_url("im/static/src/audio/Ting.mp3")
+            );
+        },
+        window_focus_change: function() {
+            if (this.get("window_focus")) {
+                this.set("waiting_messages", 0);
+            }
+        },
+        messages_change: function() {
+            //if (! instance.webclient.set_title_part)
+            //    return;
+            //instance.webclient.set_title_part("im_messages", this.get("waiting_messages") === 0 ? undefined :
+            //    _.str.sprintf(_t("%d Messages"), this.get("waiting_messages")));
+        },
+        activate_user: function(user, focus) {
+            var conv = this.users[user.get('id')];
+            if (! conv) {
+                conv = new im_common.Conversation(this, user, this.me);
+                conv.appendTo($("body"));
+                conv.on("destroyed", this, function() {
+                    this.conversations = _.without(this.conversations, conv);
+                    delete this.users[conv.user.get('id')];
+                    this.calc_positions();
+                });
+                this.conversations.push(conv);
+                this.users[user.get('id')] = conv;
+                this.calc_positions();
+            }
+            if (focus)
+                conv.focus();
+            return conv;
+        },
+        received_message: function(message, user) {
+            if (! this.get("window_focus")) {
+                this.set("waiting_messages", this.get("waiting_messages") + 1);
+                this.ting.play();
+                this.create_ting();
+            }
+            var conv = this.activate_user(user);
+            conv.received_message(message);
+        },
+        calc_positions: function() {
+            var current = this.get("right_offset");
+            _.each(_.range(this.conversations.length), function(i) {
+                this.conversations[i].set("right_position", current);
+                current += this.conversations[i].$().outerWidth(true);
+            }, this);
+        },
+        destroy: function() {
+            $(window).off("unload", this.unload_event_handler);
+            $(window).unbind("blur", this.blur_hdl);
+            $(window).unbind("focus", this.focus_hdl);
+            openerp.PropertiesMixin.destroy.call(this);
+        }
+    });
+
+    im_common.Conversation = openerp.Widget.extend({
+        className: "openerp_style oe_im_chatview",
+        events: {
+            "keydown input": "send_message",
+            "click .oe_im_chatview_close": "destroy",
+            "click .oe_im_chatview_header": "show_hide"
+        },
+        init: function(parent, user, me) {
+            this._super(parent);
+            this.me = me;
+            this.user = user;
+            this.user.add_watcher();
+            this.set("right_position", 0);
+            this.shown = true;
+            this.set("pending", 0);
+            this.inputPlaceholder = im_common.defaultInputPlaceholder;
+        },
+        start: function() {
+            this.$().append(openerp.qweb.render("conversation", {widget: this, to_url: im_common.to_url}));
+            var change_status = function() {
+                this.$().toggleClass("oe_im_chatview_disconnected_status", this.user.get("im_status") === false);
+                this.$(".oe_im_chatview_online").toggle(this.user.get("im_status") === true);
+                this._go_bottom();
+            };
+            this.user.on("change:im_status", this, change_status);
+            change_status.call(this);
+
+            this.on("change:right_position", this, this.calc_pos);
+            this.full_height = this.$().height();
+            this.calc_pos();
+            this.on("change:pending", this, _.bind(function() {
+                if (this.get("pending") === 0) {
+                    this.$(".oe_im_chatview_nbr_messages").text("");
+                } else {
+                    this.$(".oe_im_chatview_nbr_messages").text("(" + this.get("pending") + ")");
+                }
+            }, this));
+        },
+        show_hide: function() {
+            if (this.shown) {
+                this.$().animate({
+                    height: this.$(".oe_im_chatview_header").outerHeight()
+                });
+            } else {
+                this.$().animate({
+                    height: this.full_height
+                });
+            }
+            this.shown = ! this.shown;
+            if (this.shown) {
+                this.set("pending", 0);
+            }
+        },
+        calc_pos: function() {
+            this.$().css("right", this.get("right_position"));
+        },
+        received_message: function(message) {
+            if (this.shown) {
+                this.set("pending", 0);
+            } else {
+                this.set("pending", this.get("pending") + 1);
+            }
+            this._add_bubble(this.user, message.message, openerp.str_to_datetime(message.date));
+        },
+        send_message: function(e) {
+            if(e && e.which !== 13) {
+                return;
+            }
+            var mes = this.$("input").val();
+            if (! mes.trim()) {
+                return;
+            }
+            this.$("input").val("");
+            var send_it = _.bind(function() {
+                var model = im_common.connection.model("im.message");
+                return model.call("post", [mes, this.user.get('id')], {uuid: this.me.get("uuid"), context: {}});
+            }, this);
+            var tries = 0;
+            send_it().then(_.bind(function() {
+                this._add_bubble(this.me, mes, new Date());
+            }, this), function(error, e) {
+                tries += 1;
+                if (tries < 3)
+                    return send_it();
+            });
+        },
+        _add_bubble: function(user, item, date) {
+            var items = [item];
+            if (user === this.last_user) {
+                this.last_bubble.remove();
+                items = this.last_items.concat(items);
+            }
+            this.last_user = user;
+            this.last_items = items;
+            var zpad = function(str, size) {
+                str = "" + str;
+                return new Array(size - str.length + 1).join('0') + str;
+            };
+            date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2);
+            
+            this.last_bubble = $(openerp.qweb.render("conversation_bubble", {"items": items, "user": user, "time": date}));
+            $(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
+            this._go_bottom();
+        },
+        _go_bottom: function() {
+            this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
+        },
+        focus: function() {
+            this.$(".oe_im_chatview_input").focus();
+        },
+        destroy: function() {
+            this.user.remove_watcher();
+            this.trigger("destroyed");
+            return this._super();
+        }
+    });
+
+    return im_common;
+}
+
+if (typeof(define) !== undefined) {
+    define(["jquery", "underscore", "openerp"], declare);
+} else {
+    window.im_common = declare($, _, openerp);
+}
+
+})();
diff --git a/addons/im_livechat/static/ext/static/js/livesupport_templates.xml b/addons/im/static/src/xml/im_common.xml
similarity index 91%
rename from addons/im_livechat/static/ext/static/js/livesupport_templates.xml
rename to addons/im/static/src/xml/im_common.xml
index e1c80612487..df5b90cce08 100644
--- a/addons/im_livechat/static/ext/static/js/livesupport_templates.xml
+++ b/addons/im/static/src/xml/im_common.xml
@@ -3,7 +3,7 @@
 <templates>
 <t t-name="conversation">
     <div class="oe_im_chatview_header">
-        <img t-att-src="toUrl('im_livechat/static/ext/static/img/green.png')" class="oe_im_chatview_online"/>
+        <img t-att-src="to_url('im/static/src/img/green.png')" class="oe_im_chatview_online"/>
         <t t-esc="widget.user.get('name') || _t('You')"/>
         <button class="oe_im_chatview_close">×</button>
     </div>
diff --git a/addons/im_livechat/loader.js b/addons/im_livechat/loader.js
index e5ea5b2c4f5..dcb134adf65 100644
--- a/addons/im_livechat/loader.js
+++ b/addons/im_livechat/loader.js
@@ -13,6 +13,7 @@ require.config({
         openerp: "web/static/src/js/openerpframework",
         "jquery.achtung": "im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung",
         livesupport: "im_livechat/static/ext/static/js/livesupport",
+        im_common: "im/static/src/js/im_common"
     },
     shim: {
         underscore: {
@@ -30,6 +31,12 @@ require.config({
         "jquery.achtung": {
             deps: ['jquery'],
         },
+        im_common: {
+            deps: ['jquery', 'openerp', 'underscore', 'qweb2'],
+            init: function() {
+                return im_common.no_conflict();
+            }
+        },
     },
 })(["livesupport", "jquery"], function(livesupport, jQuery) {
     jQuery.noConflict();
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.mp3 b/addons/im_livechat/static/ext/static/audio/Ting.mp3
deleted file mode 100644
index ffbb77144b2..00000000000
Binary files a/addons/im_livechat/static/ext/static/audio/Ting.mp3 and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.ogg b/addons/im_livechat/static/ext/static/audio/Ting.ogg
deleted file mode 100644
index 74ee13a4e5a..00000000000
Binary files a/addons/im_livechat/static/ext/static/audio/Ting.ogg and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg b/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg
deleted file mode 100644
index 7168794022e..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/button-gloss.png b/addons/im_livechat/static/ext/static/img/button-gloss.png
deleted file mode 100755
index 6f3957702fe..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/button-gloss.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png b/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png
deleted file mode 100755
index 3bf6484a29d..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png b/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png
deleted file mode 100755
index a9969993201..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/green.png b/addons/im_livechat/static/ext/static/img/green.png
deleted file mode 100644
index 01fb373c251..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/green.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/logo.png b/addons/im_livechat/static/ext/static/img/logo.png
deleted file mode 100644
index aca5f4c60d8..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/logo.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/wood.png b/addons/im_livechat/static/ext/static/img/wood.png
deleted file mode 100644
index 22f2450d3ad..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/wood.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/js/livesupport.js b/addons/im_livechat/static/ext/static/js/livesupport.js
index 86b2d8a4c7b..c7f136b32d8 100644
--- a/addons/im_livechat/static/ext/static/js/livesupport.js
+++ b/addons/im_livechat/static/ext/static/js/livesupport.js
@@ -3,8 +3,8 @@
     This file must compile in EcmaScript 3 and work in IE7.
 */
 
-define(["openerp", "underscore", "require", "jquery",
-        "jquery.achtung"], function(openerp, _, require, $) {
+define(["openerp", "im_common", "underscore", "require", "jquery",
+        "jquery.achtung"], function(openerp, im_common, _, require, $) {
     /* jshint es3: true */
     "use strict";
 
@@ -12,15 +12,6 @@ define(["openerp", "underscore", "require", "jquery",
     
     var livesupport = {};
 
-    _.extend(openerp.qweb.default_dict, {
-        'toUrl': _.bind(require.toUrl, require)
-    });
-
-    var connection;
-
-    var defaultInputPlaceholder;
-    var userName;
-
     livesupport.main = function(server_url, db, login, password, channel, options) {
         var defs = [];
         options = options || {};
@@ -31,25 +22,27 @@ define(["openerp", "underscore", "require", "jquery",
             auto: false,
             userName: _t("Anonymous")
         });
-        defaultInputPlaceholder = options.inputPlaceholder;
-        userName = options.userName;
-        // TODO : load QwebTemplates
-        defs.push(add_css("im_livechat/static/ext/static/css/livesupport.css"));
+
+        im_common.notification = notification;
+        im_common.to_url = require.toUrl;
+        im_common.defaultInputPlaceholder = options.inputPlaceholder;
+        im_common.userName = options.userName;
+        defs.push(add_css("im/static/src/css/im_common.css"));
         defs.push(add_css("im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css"));
 
         return $.when.apply($, defs).then(function() {
             console.log("starting live support customer app");
-            connection = new openerp.Session(null, server_url, { override_session: true });
-            return connection.session_authenticate(db, login, password);
+            im_common.connection = new openerp.Session(null, server_url, { override_session: true });
+            return im_common.connection.session_authenticate(db, login, password);
         }).then(function() {
-            return connection.rpc('/web/proxy/load', {path: '/im_livechat/static/ext/static/js/livesupport_templates.xml'}).then(function(xml) {
+            return im_common.connection.rpc('/web/proxy/load', {path: '/im/static/src/xml/im_common.xml'}).then(function(xml) {
                 openerp.qweb.add_template(xml);
             });
         }).then(function() {
-            return connection.rpc("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
+            return im_common.connection.rpc("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
                 if (! activated & ! options.auto)
                     return;
-                var button = new livesupport.ChatButton(null, channel, options);
+                var button = new im_common.ChatButton(null, channel, options);
                 button.appendTo($("body"));
                 if (options.auto)
                     button.click();
@@ -59,7 +52,7 @@ define(["openerp", "underscore", "require", "jquery",
 
     var add_css = function(relative_file_name) {
         var css_def = $.Deferred();
-        $('<link rel="stylesheet" href="' + require.toUrl(relative_file_name) + '"></link>')
+        $('<link rel="stylesheet" href="' + im_common.to_url(relative_file_name) + '"></link>')
                 .appendTo($("head")).ready(function() {
             css_def.resolve();
         });
@@ -70,391 +63,5 @@ define(["openerp", "underscore", "require", "jquery",
         $.achtung({message: message, timeout: 0, showEffects: false, hideEffects: false});
     };
 
-    var ERROR_DELAY = 5000;
-
-    livesupport.ChatButton = openerp.Widget.extend({
-        className: "openerp_style oe_chat_button",
-        events: {
-            "click": "click"
-        },
-        init: function(parent, channel, options) {
-            this._super(parent);
-            this.channel = channel;
-            this.options = options;
-            this.text = options.buttonText;
-        },
-        start: function() {
-            this.$().append(openerp.qweb.render("chatButton", {widget: this}));
-        },
-        click: function() {
-            if (! this.manager) {
-                this.manager = new livesupport.ConversationManager(null);
-                this.activated_def = this.manager.start_polling();
-            }
-            var def = $.Deferred();
-            $.when(this.activated_def).then(function() {
-                def.resolve();
-            }, function() {
-                def.reject();
-            });
-            setTimeout(function() {
-                def.reject();
-            }, 5000);
-            def.then(_.bind(this.chat, this), function() {
-                notification(_t("It seems the connection to the server is encountering problems, please try again later."));
-            });
-        },
-        chat: function() {
-            var self = this;
-            if (this.manager.conversations.length > 0)
-                return;
-            connection.model("im_livechat.channel").call("get_available_user", [this.channel]).then(function(user_id) {
-                if (! user_id) {
-                    notification(_t("None of our collaborators seems to be available, please try again later."));
-                    return;
-                }
-                self.manager.ensure_users([user_id]).then(function() {
-                    var conv = self.manager.activate_user(self.manager.get_user(user_id), true);
-                    if (self.options.defaultMessage) {
-                        conv.received_message({message: self.options.defaultMessage, 
-                            date: openerp.datetime_to_str(new Date())});
-                    }
-                });
-            });
-        }
-    });
-
-    livesupport.ImUser = openerp.Class.extend(openerp.PropertiesMixin, {
-        init: function(parent, user_rec) {
-            openerp.PropertiesMixin.init.call(this, parent);
-            user_rec.image_url = require.toUrl("im_livechat/static/ext/static/img/avatar/avatar.jpeg");
-            if (user_rec.image)
-                user_rec.image_url = "data:image/png;base64," + user_rec.image;
-            this.set(user_rec);
-            this.set("watcher_count", 0);
-            this.on("change:watcher_count", this, function() {
-                if (this.get("watcher_count") === 0)
-                    this.destroy();
-            });
-        },
-        destroy: function() {
-            this.trigger("destroyed");
-            openerp.PropertiesMixin.destroy.call(this);
-        },
-        add_watcher: function() {
-            this.set("watcher_count", this.get("watcher_count") + 1);
-        },
-        remove_watcher: function() {
-            this.set("watcher_count", this.get("watcher_count") - 1);
-        }
-    });
-
-    livesupport.ConversationManager = openerp.Class.extend(openerp.PropertiesMixin, {
-        init: function(parent) {
-            openerp.PropertiesMixin.init.call(this, parent);
-            this.set("right_offset", 0);
-            this.conversations = [];
-            this.users = {};
-            this.on("change:right_offset", this, this.calc_positions);
-            this.set("window_focus", true);
-            this.set("waiting_messages", 0);
-            this.focus_hdl = _.bind(function() {
-                this.set("window_focus", true);
-            }, this);
-            $(window).bind("focus", this.focus_hdl);
-            this.blur_hdl = _.bind(function() {
-                this.set("window_focus", false);
-            }, this);
-            $(window).bind("blur", this.blur_hdl);
-            this.on("change:window_focus", this, this.window_focus_change);
-            this.window_focus_change();
-            this.on("change:waiting_messages", this, this.messages_change);
-            this.messages_change();
-            this.create_ting();
-            this.activated = false;
-            this.users_cache = {};
-            this.last = null;
-            this.unload_event_handler = _.bind(this.unload, this);
-        },
-        start_polling: function() {
-            var self = this;
-
-            var uuid = localStorage["oe_livesupport_uuid"];
-            var def = $.when(uuid);
-
-            if (! uuid) {
-                def = connection.rpc("/longpolling/im/gen_uuid", {});
-            }
-            return def.then(function(uuid) {
-                localStorage["oe_livesupport_uuid"] = uuid;
-                return connection.model("im.user").call("get_by_user_id", [uuid]);
-            }).then(function(my_id) {
-                self.my_id = my_id["id"];
-                return connection.model("im.user").call("assign_name", [uuid, userName]);
-            }).then(function() {
-                return self.ensure_users([self.my_id]);
-            }).then(function() {
-                var me = self.users_cache[self.my_id];
-                delete self.users_cache[self.my_id];
-                self.me = me;
-                me.set("name", "You");
-                return connection.rpc("/longpolling/im/activated", {});
-            }).then(function(activated) {
-                if (activated) {
-                    self.activated = true;
-                    $(window).on("unload", self.unload_event_handler);
-                    self.poll();
-                } else {
-                    return $.Deferred().reject();
-                }
-            });
-        },
-        unload: function() {
-            connection.model("im.user").call("im_disconnect", [], {uuid: this.me.get("uuid"), context: {}});
-        },
-        ensure_users: function(user_ids) {
-            var no_cache = {};
-            _.each(user_ids, function(el) {
-                if (! this.users_cache[el])
-                    no_cache[el] = el;
-            }, this);
-            var self = this;
-            if (_.size(no_cache) === 0)
-                return $.when();
-            else
-                return connection.model("im.user").call("read", [_.values(no_cache), []]).then(function(users) {
-                    self.add_to_user_cache(users);
-                });
-        },
-        add_to_user_cache: function(user_recs) {
-            _.each(user_recs, function(user_rec) {
-                if (! this.users_cache[user_rec.id]) {
-                    var user = new livesupport.ImUser(this, user_rec);
-                    this.users_cache[user_rec.id] = user;
-                    user.on("destroyed", this, function() {
-                        delete this.users_cache[user_rec.id];
-                    });
-                }
-            }, this);
-        },
-        get_user: function(user_id) {
-            return this.users_cache[user_id];
-        },
-        poll: function() {
-            console.debug("live support beggin polling");
-            var self = this;
-            var user_ids = _.map(this.users_cache, function(el) {
-                return el.get("id");
-            });
-            connection.rpc("/longpolling/im/poll", {
-                last: this.last,
-                users_watch: user_ids,
-                db: connection.database,
-                uid: connection.userId,
-                password: connection.password,
-                uuid: self.me.get("uuid")
-            }).then(function(result) {
-                _.each(result.users_status, function(el) {
-                    if (self.get_user(el.id))
-                        self.get_user(el.id).set(el);
-                });
-                self.last = result.last;
-                var user_ids = _.pluck(_.pluck(result.res, "from_id"), 0);
-                self.ensure_users(user_ids).then(function() {
-                    _.each(result.res, function(mes) {
-                        var user = self.get_user(mes.from_id[0]);
-                        self.received_message(mes, user);
-                    });
-                    self.poll();
-                });
-            }, function() {
-                setTimeout(_.bind(self.poll, self), ERROR_DELAY);
-            });
-        },
-        get_activated: function() {
-            return this.activated;
-        },
-        create_ting: function() {
-            if (typeof(Audio) === "undefined") {
-                this.ting = {play: function() {}};
-                return;
-            }
-            this.ting = new Audio(new Audio().canPlayType("audio/ogg; codecs=vorbis") ?
-                require.toUrl("im_livechat/static/ext/static/audio/Ting.ogg") :
-                require.toUrl("im_livechat/static/ext/static/audio/Ting.mp3")
-            );
-        },
-        window_focus_change: function() {
-            if (this.get("window_focus")) {
-                this.set("waiting_messages", 0);
-            }
-        },
-        messages_change: function() {
-            //if (! instance.webclient.set_title_part)
-            //    return;
-            //instance.webclient.set_title_part("im_messages", this.get("waiting_messages") === 0 ? undefined :
-            //    _.str.sprintf(_t("%d Messages"), this.get("waiting_messages")));
-        },
-        activate_user: function(user, focus) {
-            var conv = this.users[user.get('id')];
-            if (! conv) {
-                conv = new livesupport.Conversation(this, user, this.me);
-                conv.appendTo($("body"));
-                conv.on("destroyed", this, function() {
-                    this.conversations = _.without(this.conversations, conv);
-                    delete this.users[conv.user.get('id')];
-                    this.calc_positions();
-                });
-                this.conversations.push(conv);
-                this.users[user.get('id')] = conv;
-                this.calc_positions();
-            }
-            if (focus)
-                conv.focus();
-            return conv;
-        },
-        received_message: function(message, user) {
-            if (! this.get("window_focus")) {
-                this.set("waiting_messages", this.get("waiting_messages") + 1);
-                this.ting.play();
-                this.create_ting();
-            }
-            var conv = this.activate_user(user);
-            conv.received_message(message);
-        },
-        calc_positions: function() {
-            var current = this.get("right_offset");
-            _.each(_.range(this.conversations.length), function(i) {
-                this.conversations[i].set("right_position", current);
-                current += this.conversations[i].$().outerWidth(true);
-            }, this);
-        },
-        destroy: function() {
-            $(window).off("unload", this.unload_event_handler);
-            $(window).unbind("blur", this.blur_hdl);
-            $(window).unbind("focus", this.focus_hdl);
-            openerp.PropertiesMixin.destroy.call(this);
-        }
-    });
-
-    livesupport.Conversation = openerp.Widget.extend({
-        className: "openerp_style oe_im_chatview",
-        events: {
-            "keydown input": "send_message",
-            "click .oe_im_chatview_close": "destroy",
-            "click .oe_im_chatview_header": "show_hide"
-        },
-        init: function(parent, user, me) {
-            this._super(parent);
-            this.me = me;
-            this.user = user;
-            this.user.add_watcher();
-            this.set("right_position", 0);
-            this.shown = true;
-            this.set("pending", 0);
-            this.inputPlaceholder = defaultInputPlaceholder;
-        },
-        start: function() {
-            this.$().append(openerp.qweb.render("conversation", {widget: this}));
-            var change_status = function() {
-                this.$().toggleClass("oe_im_chatview_disconnected_status", this.user.get("im_status") === false);
-                this.$(".oe_im_chatview_online").toggle(this.user.get("im_status") === true);
-                this._go_bottom();
-            };
-            this.user.on("change:im_status", this, change_status);
-            change_status.call(this);
-
-            this.on("change:right_position", this, this.calc_pos);
-            this.full_height = this.$().height();
-            this.calc_pos();
-            this.on("change:pending", this, _.bind(function() {
-                if (this.get("pending") === 0) {
-                    this.$(".oe_im_chatview_nbr_messages").text("");
-                } else {
-                    this.$(".oe_im_chatview_nbr_messages").text("(" + this.get("pending") + ")");
-                }
-            }, this));
-        },
-        show_hide: function() {
-            if (this.shown) {
-                this.$().animate({
-                    height: this.$(".oe_im_chatview_header").outerHeight()
-                });
-            } else {
-                this.$().animate({
-                    height: this.full_height
-                });
-            }
-            this.shown = ! this.shown;
-            if (this.shown) {
-                this.set("pending", 0);
-            }
-        },
-        calc_pos: function() {
-            this.$().css("right", this.get("right_position"));
-        },
-        received_message: function(message) {
-            if (this.shown) {
-                this.set("pending", 0);
-            } else {
-                this.set("pending", this.get("pending") + 1);
-            }
-            this._add_bubble(this.user, message.message, openerp.str_to_datetime(message.date));
-        },
-        send_message: function(e) {
-            if(e && e.which !== 13) {
-                return;
-            }
-            var mes = this.$("input").val();
-            if (! mes.trim()) {
-                return;
-            }
-            this.$("input").val("");
-            var send_it = _.bind(function() {
-                var model = connection.model("im.message");
-                return model.call("post", [mes, this.user.get('id')], {uuid: this.me.get("uuid"), context: {}});
-            }, this);
-            var tries = 0;
-            send_it().then(_.bind(function() {
-                this._add_bubble(this.me, mes, new Date());
-            }, this), function(error, e) {
-                tries += 1;
-                if (tries < 3)
-                    return send_it();
-            });
-        },
-        _add_bubble: function(user, item, date) {
-            var items = [item];
-            if (user === this.last_user) {
-                this.last_bubble.remove();
-                items = this.last_items.concat(items);
-            }
-            this.last_user = user;
-            this.last_items = items;
-            var zpad = function(str, size) {
-                str = "" + str;
-                return new Array(size - str.length + 1).join('0') + str;
-            };
-            date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2);
-            
-            this.last_bubble = $(openerp.qweb.render("conversation_bubble", {"items": items, "user": user, "time": date}));
-            $(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
-            this._go_bottom();
-        },
-        _go_bottom: function() {
-            this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
-        },
-        focus: function() {
-            this.$(".oe_im_chatview_input").focus();
-        },
-        destroy: function() {
-            this.user.remove_watcher();
-            this.trigger("destroyed");
-            return this._super();
-        }
-    });
-
-
-
     return livesupport;
 });