3 files changed, 23 insertions, 14 deletions

diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
index 200d9415f..38293b070 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
@@ -37,16 +37,18 @@
 
       <a i18n class="button-show-channel peertube-button-link orange-button-inverted" [routerLink]="getVideoChannelLink(videoChannel)">Show this channel</a>
 
-      <div class="videos">
-        <div class="no-results" i18n *ngIf="getTotalVideosOf(videoChannel) === 0">This channel doesn't have any videos.</div>
-
-        <my-video-miniature
-          *ngFor="let video of getVideosOf(videoChannel)"
-          [video]="video" [user]="userMiniature" [displayVideoActions]="true" [displayOptions]="miniatureDisplayOptions"
-        ></my-video-miniature>
-
-        <div *ngIf="getTotalVideosOf(videoChannel)" class="miniature-show-channel">
-          <a i18n [routerLink]="getVideoChannelLink(videoChannel)">SHOW THIS CHANNEL ></a>
+      <div class="videos-overflow-workaround">
+        <div class="videos">
+          <div class="no-results" i18n *ngIf="getTotalVideosOf(videoChannel) === 0">This channel doesn't have any videos.</div>
+
+          <my-video-miniature
+            *ngFor="let video of getVideosOf(videoChannel)"
+            [video]="video" [user]="userMiniature" [displayVideoActions]="true" [displayOptions]="miniatureDisplayOptions"
+          ></my-video-miniature>
+
+          <div *ngIf="getTotalVideosOf(videoChannel)" class="miniature-show-channel">
+            <a i18n [routerLink]="getVideoChannelLink(videoChannel)">SHOW THIS CHANNEL ></a>
+          </div>
         </div>
       </div>
     </div>
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
index 832ddf973..11ed4c3b1 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
@@ -77,10 +77,8 @@ my-subscribe-button {
   display: flex;
   grid-column: 1 / 3;
   grid-row: 2;
-  margin-top: 30px;
 
   position: relative;
-  overflow: hidden;
 
   my-video-miniature {
     @include margin-right(15px);
@@ -94,6 +92,11 @@ my-subscribe-button {
   }
 }
 
+.videos-overflow-workaround {
+  margin-top: 30px;
+  overflow-x: hidden;
+}
+
 .miniature-show-channel {
   height: 100%;
   position: absolute;
@@ -112,7 +115,7 @@ my-subscribe-button {
   display: none;
 }
 
-@media screen and (max-width: $mobile-view) {
+@include on-small-main-col {
   .channel {
     padding: 15px;
   }
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
index 457a432fe..59814a93d 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
@@ -105,7 +105,11 @@ export class AccountVideoChannelsComponent implements OnInit, OnDestroy {
         })
       )
       .subscribe(async ({ videoChannel, videos, total }) => {
-        this.channelsDescriptionHTML[videoChannel.id] = await this.markdown.textMarkdownToHTML(videoChannel.description)
+        this.channelsDescriptionHTML[videoChannel.id] = await this.markdown.textMarkdownToHTML({
+          markdown: videoChannel.description,
+          withEmoji: true,
+          withHtml: true
+        })
 
         this.videoChannels.push(videoChannel)