diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0c63698b209..23a361b0ff9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -58,7 +58,7 @@
                     <field name="user_id"/>
                     <field name="assigned_to" />
                         <group colspan="2" col="4">
-                            <field name="type_id" widget="selection" readonly="1"/>
+                            <field name="type_id" readonly="1"/>
                             <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                             <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                         </group>
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 32a5a1657fa..79d0f8a14fa 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 114cf8cdce6..8d5068fd39b 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
index 064f8453d28..6bc2a6e885f 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
@@ -5,11 +5,22 @@ function config_close()
     window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
 
+
+function createMenuItem(aLabel, aValue) {
+    const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
+    item.setAttribute("label", aLabel);
+    item.setAttribute("value", aValue);
+    return item;
+}
 //set the value of the configuration fields
 function config_change_load()
 {
     var s = getServer();
     var a =s.split(':');
+    var popup = document.getElementById("dbprotocol_list");
+    popup.menupopup.appendChild(createMenuItem('XML-RPC','http://'));
+    popup.menupopup.appendChild(createMenuItem('XML-RPCS','https://'));
     if (String(a)=="" || String(a)=="undefined"){
         document.getElementById('txtcurl').value = "localhost"
         document.getElementById('txtcport').value = "8069"
@@ -91,6 +102,7 @@ function config_change_load_web()
 
 function config_ok()
 {
+    var protocol = document.getElementById("dbprotocol_list").value
     if (document.getElementById('txtcurl').value == '')
     {
         alert("You Must Enter Server Name!")
@@ -102,7 +114,12 @@ function config_ok()
         alert("You Must Enter Port!")
         return false;
     }
-    setServer("http://"+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
+    if (protocol == '')
+    {
+        alert("Invalid Porotocol!\nPlease Select protocol from Connection protocol list.")
+        return false;
+    }
+    setServer(document.getElementById("dbprotocol_list").value+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
     window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
     window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
index dece3457710..441c426c97d 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
@@ -3,23 +3,33 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/config_change.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"  onload="config_change_load();"
-	title="Openerp Connection" height="140" width="240">
+	title="Openerp Connection" height="180" width="320">
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/loaddata.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/static.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 	<hbox>
-	 <label  align="center" id="heading"  value="&lblheading.label;" style="padding-left:38px" />
+	 <label  align="left" id="heading"  value="&lblheading.label;" style="padding-left:38px" />
     </hbox>
-<groupbox id="gpData" width="200">
+    <vbox style="border:0.5px solid gray" width="190"/>
+	<groupbox id="gpData" width="200">
 	<hbox >
 		<label id="lblurl" control="txtcurl" value="&lblurl.label;" width="50"/>
-		<textbox id="txtcurl" width="140" />
+		<textbox id="txtcurl" width="170" />
 	</hbox>
 	<hbox>	
 		<label id="lblport" control="txtcport" value="&lblport.label;" width="50"/>
-		<textbox id="txtcport" width="140" />
+		<textbox id="txtcport" width="170" />
+	</hbox>
+
+	<hbox>
+		<label id="dbprotocol"  value="&lblprotocol.label;" width="97" />
+		<menulist id="dbprotocol_list" width="140">
+			<menupopup>
+				<menuitem label="" value=""/>
+			</menupopup>
+		</menulist>
 	</hbox>
     
 </groupbox>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
index 5ec72d0b250..19558a9f077 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
@@ -1,6 +1,6 @@
-<!ENTITY lblurl.label "Server: ">
-<!ENTITY lblport.label "Port: ">
+<!ENTITY lblurl.label "               Server: ">
+<!ENTITY lblport.label "                   Port: ">
 <!ENTITY lblheading.label "Openerp Connection">
 <!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
 <!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
-
+<!ENTITY lblprotocol.label "Protocol Connection: ">