diff --git a/app/internal_packages/composer/lib/composer-view.jsx b/app/internal_packages/composer/lib/composer-view.jsx
index 85122ec86..1ee6f43b2 100644
--- a/app/internal_packages/composer/lib/composer-view.jsx
+++ b/app/internal_packages/composer/lib/composer-view.jsx
@@ -459,7 +459,7 @@ export default class ComposerView extends React.Component {
     // Ensure that you can't pick up a file and drop it on the same draft
     const nonNativeFilePath = this._nonNativeFilePathForDrop(event);
 
-    const hasNativeFile = event.dataTransfer.files.length > 0;
+    const hasNativeFile = event.dataTransfer.types.includes('Files');
     const hasNonNativeFilePath = nonNativeFilePath !== null;
 
     return hasNativeFile || hasNonNativeFilePath;
diff --git a/app/internal_packages/composer/specs/composer-view-spec.cjsx b/app/internal_packages/composer/specs/composer-view-spec.cjsx
index 5176921d9..39528e7a0 100644
--- a/app/internal_packages/composer/specs/composer-view-spec.cjsx
+++ b/app/internal_packages/composer/specs/composer-view-spec.cjsx
@@ -450,7 +450,7 @@ describe "ComposerView", ->
         event =
           dataTransfer:
             files:[{'pretend':'imafile'}]
-            types:[]
+            types:['Files']
         expect(@composer._shouldAcceptDrop(event)).toBe(true)
 
       it "should return true if the event is carrying a non-native file URL", ->
diff --git a/app/internal_packages/composer/styles/composer.less b/app/internal_packages/composer/styles/composer.less
index a26280170..256a01171 100644
--- a/app/internal_packages/composer/styles/composer.less
+++ b/app/internal_packages/composer/styles/composer.less
@@ -75,7 +75,7 @@ body.platform-win32 {
 
     .nylas-attachment-item.image-attachment-item {
       margin: 0;
-      max-width: 100%;
+      max-width: calc(100% - 22px); // right margin of composer
       min-width: 0;
     }
   }
diff --git a/app/src/browser/config-persistence-manager.es6 b/app/src/browser/config-persistence-manager.es6
index 522737107..56d7c7c1c 100644
--- a/app/src/browser/config-persistence-manager.es6
+++ b/app/src/browser/config-persistence-manager.es6
@@ -43,7 +43,7 @@ export default class ConfigPersistenceManager {
 
   _showLoadErrorDialog(error) {
     const message = `Failed to load "${path.basename(this.configFilePath)}"`;
-    let detail = (error.location) ? error.stack : error.message;
+    let detail = error.message;
 
     if (error instanceof SyntaxError) {
       detail += `\n\nThe file ${this.configFilePath} has incorrect JSON formatting or is empty. Fix the formatting to resolve this error, or reset your settings to continue using N1.`
diff --git a/app/static/components/attachment-items.less b/app/static/components/attachment-items.less
index 6cafe887e..db0323b75 100644
--- a/app/static/components/attachment-items.less
+++ b/app/static/components/attachment-items.less
@@ -214,8 +214,8 @@ body.platform-win32 {
   .file-action-icon {
     position: absolute;
     z-index: 2;
-    right: -8px;
-    top: -8px;
+    right: 2px;
+    top: -14px;
     width: 26px;
     border-radius: 0 0 0 3px;
     border: none;