diff --git a/src/views/messages-view.jsx b/src/views/messages-view.jsx
index 752c1443..03bf59cb 100644
--- a/src/views/messages-view.jsx
+++ b/src/views/messages-view.jsx
@@ -15,6 +15,7 @@ import LetterTile from '../widgets/letter-tile.jsx';
 import LoadSpinner from '../widgets/load-spinner.jsx';
 import LogoView from './logo-view.jsx';
 import SendMessage from '../widgets/send-message.jsx';
+import UploadingImage from '../widgets/uploading-image.jsx'
 
 import { DEFAULT_P2P_ACCESS_MODE, IMAGE_PREVIEW_DIM, KEYPRESS_DELAY, MESSAGES_PAGE,
   MAX_EXTERN_ATTACHMENT_SIZE, MAX_IMAGE_DIM, MAX_INBAND_ATTACHMENT_SIZE, READ_DELAY,
@@ -974,6 +975,7 @@ class MessagesView extends React.Component {
           <ImagePreview
             content={this.state.imagePreview}
             tinode={this.props.tinode}
+            viewportWidth={this.props.viewportWidth}
             replyTo={this.state.reply}
             formatter={draftyFormatter}
             onCancelReply={this.handleCancelReply}
@@ -993,6 +995,7 @@ class MessagesView extends React.Component {
           <DocPreview
             content={this.state.docPreview}
             tinode={this.props.tinode}
+            viewportWidth={this.props.viewportWidth}
             replyTo={this.state.reply}
             formatter={draftyFormatter}
             onCancelReply={this.handleCancelReply}
@@ -1178,6 +1181,7 @@ class MessagesView extends React.Component {
               <SendMessage
                 tinode={this.props.tinode}
                 disabled={!this.state.isWriter}
+                viewportWidth={this.props.viewportWidth}
                 onKeyPress={this.sendKeyPress}
                 onSendMessage={this.sendMessage}
                 onAttachFile={this.handleAttachFile}
@@ -1276,8 +1280,11 @@ function draftyFormatter(style, data, values, key) {
             attr.src = this.props.tinode.authorizeURL(sanitizeImageUrl(attr.src));
             attr.alt = data.name;
             if (attr.src) {
-              attr.onClick = this.handleImagePreview;
-              attr.className += ' image-clickable';
+              if (Math.max(data.width || 0, data.height || 0) > IMAGE_THUMBNAIL_DIM) {
+                // Allow previews for large enough images.
+                attr.onClick = this.handleImagePreview;
+                attr.className += ' image-clickable';
+              }
               attr.loading = 'lazy';
             } else {
               attr.src = 'img/broken_image.png';
diff --git a/src/widgets/chat-message.jsx b/src/widgets/chat-message.jsx
index 3c0d4643..03195a9b 100644
--- a/src/widgets/chat-message.jsx
+++ b/src/widgets/chat-message.jsx
@@ -6,7 +6,6 @@ import { Drafty } from 'tinode-sdk';
 import Attachment from './attachment.jsx';
 import LetterTile from './letter-tile.jsx';
 import ReceivedMarker from './received-marker.jsx'
-import UploadingImage from './uploading-image.jsx'
 
 import { sanitizeImageUrl, sanitizeUrl } from '../lib/utils.js';
 
diff --git a/src/widgets/context-menu.jsx b/src/widgets/context-menu.jsx
index 1540ac02..c509f7a5 100644
--- a/src/widgets/context-menu.jsx
+++ b/src/widgets/context-menu.jsx
@@ -424,7 +424,6 @@ class ContextMenu extends React.Component {
   }
 
   replyToMessage(params, errorHandler) {
-    console.log("Reply to message", params);
     params.pickReply({ seq: params.seq, content: params.content });
   }
 
diff --git a/src/widgets/doc-preview.jsx b/src/widgets/doc-preview.jsx
index 8714c91d..dd3c3116 100644
--- a/src/widgets/doc-preview.jsx
+++ b/src/widgets/doc-preview.jsx
@@ -46,6 +46,7 @@ export default class DocPreview extends React.PureComponent {
         <SendMessage
           noInput={true}
           tinode={this.props.tinode}
+          viewportWidth={this.props.viewportWidth}
           replyTo={this.props.replyTo}
           formatter={this.props.formatter}
           onCancelReply={this.props.onCancelReply}
diff --git a/src/widgets/image-preview.jsx b/src/widgets/image-preview.jsx
index d62ea997..45b52e9a 100644
--- a/src/widgets/image-preview.jsx
+++ b/src/widgets/image-preview.jsx
@@ -74,6 +74,7 @@ export default class ImagePreview extends React.PureComponent {
             messagePrompt="add_image_caption"
             acceptBlank={true}
             tinode={this.props.tinode}
+            viewportWidth={this.props.viewportWidth}
             replyTo={this.props.replyTo}
             formatter={this.props.formatter}
             onCancelReply={this.props.onCancelReply}
diff --git a/src/widgets/send-message.jsx b/src/widgets/send-message.jsx
index bb660433..9a922b84 100644
--- a/src/widgets/send-message.jsx
+++ b/src/widgets/send-message.jsx
@@ -146,7 +146,7 @@ class SendMessage extends React.PureComponent {
   handleQuoteClick(e) {
     e.preventDefault();
     e.stopPropagation();
-    if (this.props.replyTo) {
+    if (this.props.replyTo && this.props.onQuoteClick) {
       const replyToSeq = this.props.replyTo.seq;
       this.props.onQuoteClick(replyToSeq);
     }