diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts
index e988993b..a105a687 100644
--- a/src/components/chat/bubbles.ts
+++ b/src/components/chat/bubbles.ts
@@ -450,9 +450,12 @@ export default class ChatBubbles {
           return;
         }
         
-        const bubble = (e.target as HTMLElement).classList.contains('bubble') ? e.target as HTMLElement : null;
+        const target = e.target as HTMLElement;
+        const bubble = target.classList.contains('bubble') ? 
+          target : 
+          (target.classList.contains('document-selection') ? target.parentElement : null);
         if(bubble && !bubble.classList.contains('bubble-first')) {
-          const mid = +bubble.dataset.mid
+          const mid = +bubble.dataset.mid;
           this.chat.input.initMessageReply(mid);
         }
       });
@@ -801,6 +804,11 @@ export default class ChatBubbles {
       return;
     }
 
+    if(!isTouchSupported && findUpClassName(target, 'time')) {
+      this.chat.selection.toggleByBubble(bubble);
+      return;
+    }
+
     // ! Trusted - due to audio autoclick
     if(this.chat.selection.isSelecting && e.isTrusted) {
       if(bubble.classList.contains('service') && bubble.dataset.mid === undefined) {
@@ -2479,7 +2487,7 @@ export default class ChatBubbles {
             quoteTextDiv.append(previewResizer);
           }
 
-          let t: HTMLElement;
+          // let t: HTMLElement;
           if(webpage.site_name) {
             let nameEl = document.createElement('a');
             nameEl.classList.add('webpage-name');
@@ -2487,7 +2495,7 @@ export default class ChatBubbles {
             nameEl.href = webpage.url || '#';
             setInnerHTML(nameEl, RichTextProcessor.wrapEmojiText(webpage.site_name));
             quoteTextDiv.append(nameEl);
-            t = nameEl;
+            // t = nameEl;
           }
 
           if(webpage.rTitle) {
@@ -2495,7 +2503,7 @@ export default class ChatBubbles {
             titleDiv.classList.add('title');
             setInnerHTML(titleDiv, webpage.rTitle);
             quoteTextDiv.append(titleDiv);
-            t = titleDiv;
+            // t = titleDiv;
           }
 
           if(webpage.rDescription) {
@@ -2503,14 +2511,14 @@ export default class ChatBubbles {
             textDiv.classList.add('text');
             setInnerHTML(textDiv, webpage.rDescription);
             quoteTextDiv.append(textDiv);
-            t = textDiv;
+            // t = textDiv;
           }
 
-          if(t) {
+          /* if(t) {
             t.append(timeSpan);
           } else {
             box.classList.add('no-text');
-          }
+          } */
 
           quote.append(quoteTextDiv);
 
@@ -2523,6 +2531,10 @@ export default class ChatBubbles {
               bubble.classList.add('is-square-photo');
               isSquare = true;
               this.appPhotosManager.setAttachmentSize(webpage.photo, preview, 32, 32, false);
+
+              /* if(t) {
+                t.append(timeSpan);
+              } */
             } else if(size.h > size.w) {
               bubble.classList.add('is-vertical-photo');
             }
@@ -2545,8 +2557,11 @@ export default class ChatBubbles {
           box.append(quote);
           
           //bubble.prepend(box);
-          messageDiv.append(box);
-          // messageDiv.insertBefore(box, messageDiv.lastElementChild);
+          // if(timeSpan.parentElement === messageDiv) {
+            messageDiv.insertBefore(box, timeSpan);
+          // } else {
+          //   messageDiv.append(box);
+          // }
           
           //this.log('night running', bubble.scrollHeight);
           
diff --git a/src/scss/partials/_chatBubble.scss b/src/scss/partials/_chatBubble.scss
index 077fb3c9..d4171f1f 100644
--- a/src/scss/partials/_chatBubble.scss
+++ b/src/scss/partials/_chatBubble.scss
@@ -814,7 +814,8 @@ $bubble-margin: .25rem;
   }
 
   .web {
-    margin: .125rem 0;
+    // margin: .125rem 0;
+    margin: .125rem 0 -.5625rem;
     max-width: 100%;
     overflow: hidden;
     line-height: var(--line-height);
@@ -836,12 +837,16 @@ $bubble-margin: .25rem;
       &-resizer {
         &:first-child {
           margin: 3px 0;
+
+          &:last-child {
+            margin-bottom: 2px;
+          }
         }
       }
     }
 
     &.no-text {
-      margin-bottom: .625rem;
+      margin-bottom: .75rem;
     }
     
     .title {
@@ -875,6 +880,7 @@ $bubble-margin: .25rem;
       display: flex;
 
       &-text {
+        width: 100%;
         // max-width: calc(100% - .625rem); // left border
         max-width: 100%;
         padding-left: .625rem;
@@ -902,11 +908,16 @@ $bubble-margin: .25rem;
     }
 
     .web {
+      .webpage-name {
+        margin-right: 1rem;
+      }
+
       .preview-resizer {
         margin: 0;
         width: 2rem;
         height: 2rem;
         float: right;
+        margin-left: .625rem;
       }
 
       .preview {
@@ -1386,12 +1397,12 @@ $bubble-margin: .25rem;
     pointer-events: none; // do not show title
     display: inline-flex;
     z-index: 1;
-    cursor: default;
     /* display: inline-flex;
     align-items: center; */
     height: 12px;
     direction: ltr;
     float: right; // * rtl fix
+    cursor: pointer;
 
     i {
       font-size: 1.15rem;