Merge branch 'devel' into calls-dev

src/version.js

@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-export const PACKAGE_VERSION = "0.18.0";
+export const PACKAGE_VERSION = "0.18.1";

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);
+              }
             }
           }