diff --git a/background.html b/background.html
index eed124db7..7a5437e1f 100644
--- a/background.html
+++ b/background.html
@@ -135,7 +135,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='file-size-modal'>
       Sorry, the selected file exceeds message size
-      restrictions. ({{ limit }}kB)
+      restrictions. ({{ limit }}{{ units }})
   </script>
   <script type='text/x-tmpl-mustache' id='message-detail'>
     <div class='conversation-header'>
diff --git a/js/views/file_input_view.js b/js/views/file_input_view.js
index d2680ba54..d89cc884b 100644
--- a/js/views/file_input_view.js
+++ b/js/views/file_input_view.js
@@ -113,14 +113,27 @@
 
             this.autoScale(file).then(function(blob) {
                 var limitKb = 1000000;
-                switch (type) {
-                    case 'image': limitKb = 420; break;
-                    case 'audio': limitKb = 32000; break;
-                    case 'video': limitKb = 8000; break;
+                var blobType = file.type === 'image/gif' ? 'gif' : type;
+                switch (blobType) {
+                    case 'image':
+                        limitKb = 420; break;
+                    case 'gif':
+                        limitKb = 5000; break;
+                    case 'audio':
+                        limitKb = 100000; break;
+                    case 'video':
+                        limitKb = 100000; break;
                 }
                 if ((blob.size/1024).toFixed(4) >= limitKb) {
+                    var units = ['kB','MB','GB'];
+                    var u = -1;
+                    var limit = limitKb * 1000;
+                    do {
+                      limit /= 1000;
+                      ++u;
+                    } while (limit >= 1000 && u < units.length - 1);
                     var toast = new Whisper.FileSizeToast({
-                        model: {limit: limitKb}
+                        model: {limit: limit, units: units[u]}
                     });
                     toast.$el.insertAfter(this.$el);
                     toast.render();