diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js
index c8510272bd..7a7e54ce7f 100644
--- a/static/js/feature_flags.js
+++ b/static/js/feature_flags.js
@@ -7,6 +7,7 @@ exports.mark_read_at_bottom = page_params.staging;
 exports.summarize_read_while_narrowed = page_params.staging;
 exports.twenty_four_hour_time = _.contains([],
                                   page_params.email);
+exports.dropbox_integration = page_params.staging || _.contains(['dropbox.com'], page_params.domain);
 return exports;
 
 }());
diff --git a/static/js/ui.js b/static/js/ui.js
index 8d1b42dad1..a22ba7320f 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -1096,6 +1096,10 @@ $(function () {
     if (window.XMLHttpRequest && (new XMLHttpRequest()).upload) {
         $("#compose #attach_files").removeClass("notdisplayed");
     }
+    if (feature_flags.dropbox_integration && Dropbox.isBrowserSupported()) {
+        $("#compose #attach_dropbox_files").removeClass("notdisplayed");
+    }
+
 
     // Event bindings for "Compose" pane
 
@@ -1107,6 +1111,24 @@ $(function () {
         $("#compose #file_input").trigger("click");
     } );
 
+    $("#compose").on("click", "#attach_dropbox_files", function (e) {
+        e.preventDefault();
+        var options = {
+            // Required. Called when a user selects an item in the Chooser.
+            success: function (files) {
+                var textbox = $("#new_message_content");
+                var links = _.map(files, function (file) { return '[' + file.name + '](' + file.link +')'; })
+                             .join(' ') + ' ';
+                textbox.val(textbox.val() + links);
+
+            },
+            // Optional. A value of false (default) limits selection to a single file, while
+            // true enables multiple file selection.
+            multiselect: true
+        };
+        Dropbox.choose(options);
+    });
+
     $("#subscriptions_table").on("mouseover", ".subscription_header", function (e) {
         $(this).addClass("active");
     });
diff --git a/templates/zerver/base.html b/templates/zerver/base.html
index 5c9bcadf27..f9e76960c3 100644
--- a/templates/zerver/base.html
+++ b/templates/zerver/base.html
@@ -18,6 +18,7 @@
     <![endif]-->
     <link href="/static/favicon.ico?v=2" rel="shortcut icon">
 
+    <script type="text/javascript" src="https://www.dropbox.com/static/api/1/dropins.js" id="dropboxjs" data-app-key="xxxxxxxxxxxxxxx"></script>
     {# mixpanel #}
     <script type="text/javascript">
 (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src=("https:"===e.location.protocol?"https:":"http:")+'//cdn.mxpnl.com/libs/mixpanel-2.2.min.js';f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f);b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==
diff --git a/templates/zerver/compose.html b/templates/zerver/compose.html
index 34cef4d477..fb1d343e49 100644
--- a/templates/zerver/compose.html
+++ b/templates/zerver/compose.html
@@ -57,6 +57,9 @@
               <td id="left-of-compose">
                 <div>
                   <input type="file" id="file_input" class="notvisible pull-left" multiple />
+                  {# TODO UPDATE ICON #}
+                  <a class="message-control-button icon-vector-dropbox notdisplayed"
+                     id="attach_dropbox_files" href="#" title="Attach files from Dropbox"></a><br />
                   <a class="message-control-button icon-vector-paper-clip notdisplayed"
                      id="attach_files" href="#" title="Attach files"></a><br />
                   <a class="message-control-button icon-vector-font"
diff --git a/tools/jslint/check-all.js b/tools/jslint/check-all.js
index 8521663a98..2b88cc6a11 100644
--- a/tools/jslint/check-all.js
+++ b/tools/jslint/check-all.js
@@ -3,7 +3,7 @@
 // Global variables, categorized by place of definition.
 var globals =
     // Third-party libraries
-      ' $ _ jQuery Spinner Handlebars XDate zxcvbn Intl mixpanel Notification'
+      ' $ _ jQuery Spinner Handlebars XDate zxcvbn Intl mixpanel Notification Dropbox'
 
     // Node-based unit tests
     + ' module'