merge with master

src/widgets/contact-list.jsx

@@ -84,9 +84,11 @@ class ContactList extends React.Component {
             if (msg) {
               forwarded = msg.head ? msg.head.forwarded : null;
               deliveryStatus = msg._status || c.msgStatus(msg, true);
-              preview = typeof msg.content == 'string' ?
-                msg.content.substr(0, MESSAGE_PREVIEW_LENGTH) :
-                Drafty.preview(msg.content, MESSAGE_PREVIEW_LENGTH);
+              if (msg.content) {
+                preview = typeof msg.content == 'string' ?
+                  msg.content.substr(0, MESSAGE_PREVIEW_LENGTH) :
+                  Drafty.preview(msg.content, MESSAGE_PREVIEW_LENGTH);
+              }
             }
           }
 

src/widgets/topic-desc-edit.jsx

@@ -109,7 +109,7 @@ export default class TopicDescEdit extends React.Component {
   // for uploading it to the server out of band.
   uploadAvatar(mime, blob, width, height) {
     const readyToUpload = (image) => {
-      let {mime, blob, width, height} = image;
+      let {mime, blob} = image;
       if (blob.size > MAX_AVATAR_BYTES) {
         // Too large to send inband - uploading out of band and sending as a link.
         const uploader = this.props.tinode.getLargeFileHelper();