6 files changed, 15 insertions, 7 deletions
diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl
index 36efd771..59e54a6a 100644
--- a/client/components/activities/activities.styl
+++ b/client/components/activities/activities.styl
@@ -21,6 +21,8 @@
       align-self: center
       margin: 0
       margin-left: 3px
+      overflow: hidden;
+      word-break: break-word;
 
       .activity-comment
         display: block
diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade
index c8442691..0f79323b 100644
--- a/client/components/cards/attachments.jade
+++ b/client/components/cards/attachments.jade
@@ -21,8 +21,8 @@ template(name="attachmentDeletePopup")
 template(name="attachmentsGalery")
   .attachments-galery
     each attachments
-      a.attachment-item.swipebox(href="{{url}}" title="{{name}}")
-        .attachment-thumbnail
+      .attachment-item
+        a.attachment-thumbnail.swipebox(href="{{url}}" title="{{name}}")
           if isUploaded
             if isImage
               img.attachment-thumbnail-img(src="{{url}}")
diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index 36e8a5ec..b1f88bf1 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -60,7 +60,13 @@ Template.cardAttachmentsPopup.events({
       file.boardId = card.boardId;
       file.cardId = card._id;
       file.userId = Meteor.userId();
-      Attachments.insert(file);
+
+      const attachment = Attachments.insert(file);
+
+      if (attachment && attachment._id && attachment.isImage()) {
+        card.setCover(attachment._id);
+      }
+
       Popup.close();
     });
   },
diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js
index d3a946f0..5c0e3d2e 100644
--- a/client/components/cards/checklists.js
+++ b/client/components/cards/checklists.js
@@ -181,8 +181,8 @@ BlazeComponent.extendComponent({
 Template.checklistDeleteDialog.onCreated(() => {
   const $cardDetails = this.$('.card-details');
   this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
-                       top: false, //required for smooth scroll animation
-                     };
+    top: false, //required for smooth scroll animation
+  };
   //Callback's purpose is to only prevent scrolling after animation is complete
   $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });
 
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 5987b772..5f384ece 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -6,7 +6,7 @@ Template.editor.onRendered(() => {
   $textarea.escapeableTextComplete([
     // Emoji
     {
-      match: /\B:([\-+\w]*)$/,
+      match: /\B:([-+\w]*)$/,
       search(term, callback) {
         callback(Emoji.values.map((emoji) => {
           return emoji.includes(term) ? emoji : null;
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index fabcc70c..8c1ff1c7 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -116,7 +116,7 @@ BlazeComponent.extendComponent({
       const from = this.checkField('#mail-server-from');
       const tls = $('#mail-server-tls.is-checked').length > 0;
       Settings.update(Settings.findOne()._id, {$set:{'mailServer.host':host, 'mailServer.port': port, 'mailServer.username': username,
-          'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from}});
+        'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from}});
     } catch (e) {
       return;
     } finally {