diff --git a/NEWS b/NEWS
index 2bb41f370..e7afcca7a 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Enhancements
 
 Bug fixes
  - [web] fixed crash when an attachment filename has no extension
+ - [web] dragging a toolbar button was blocking the mail editor in Firefox
  - [eas] handle base64 EAS protocol version
 
 2.3.12 (2016-06-10)
diff --git a/UI/Templates/UIxToolbar.wox b/UI/Templates/UIxToolbar.wox
index fa4144dd4..431b58131 100644
--- a/UI/Templates/UIxToolbar.wox
+++ b/UI/Templates/UIxToolbar.wox
@@ -11,7 +11,7 @@
       <var:foreach list="toolbarConfig" item="toolbarGroup">
         <var:foreach list="toolbarGroup" item="buttonInfo">
           <var:if condition="isButtonEnabled">
-            <a var:class="cssClasses"
+            <a var:class="cssClasses" draggable="false" ondragstart="return false"
               var:href="buttonInfo.link"
               var:target="buttonInfo.target"
               var:onclick="buttonInfo.onclick"
@@ -27,7 +27,7 @@
           
           <var:if condition="isButtonEnabled" const:negate="YES">
             <span var:class="cssClasses">
-              <img class="buttonImage"
+              <img class="buttonImage" draggable="false" ondragstart="return false"
                 var:src="buttonImage"
                 var:alt="buttonTooltip"/><br/>
                 <span class="buttonLabel">
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 4ec2ec9b3..b7849e8c7 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -1072,7 +1072,11 @@ DIV#toolbar
   margin: 0px;
   padding: 0px;
   white-space: nowrap;
-  overflow: hidden; }
+  overflow: hidden;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none; }
 
 BODY.popup DIV#toolbar
 { border-top: 0px; }