diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss
old mode 100644
new mode 100755
index bafdf69f8ebbbc71862237e75696f50d9d32de8c..790ecf4d14461d86827a7e090f25d34f93425a35
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/styles.scss
@@ -51,7 +51,7 @@
   flex: 1;
   display: flex;
   flex-flow: column;
-  overflow: hidden;
+  width: calc(100% - 1.7rem);
 }
 
 .meta {
@@ -70,9 +70,15 @@
   min-width: 0;
   font-weight: 600;
   color: $color-heading;
+  width: 100%;
+  position: relative;
 
   > span {
     @extend %text-elipsis;
+    padding: .5rem 0;
+    position: absolute;
+    top: -.5rem;
+    width: 100%;
   }
 }
 
diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss b/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss
index 2715196f05c1619b4487ffa9eaafbbc868d79e24..1ad8126a5ea13a3b2bab5f4a257e7a1f95ca99bd 100755
--- a/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/dropdown/list/styles.scss
@@ -30,6 +30,7 @@ $item-border-focus: $color-blue-lighter;
   flex-direction: row;
   @include mq($small-only) {
     flex-direction: column;
+    padding: $line-height-computed;
   }
 }
 
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss
old mode 100644
new mode 100755
index de5714574d0b7a76c257968e620d1097a33e1651..45ef15c2ffdb11bfffb4a028ca61a2f09d043324
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-name/styles.scss
@@ -18,6 +18,7 @@
   transition: all 0.3s;
   font-weight: 400;
   color: $color-gray-dark;
+  padding: .5rem 0;
 }
 
 .userNameSub {
@@ -34,5 +35,3 @@
     font-size: 75%;
   }
 }
-
-
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
index 39101c21101226fc0e5917d580a70506a58cdb55..867ba8f7ba2f2118527bcf093ac069580ea5a164 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
@@ -19,6 +19,10 @@ const intlMessages = defineMessages({
     id: 'app.video.videoMenuDesc',
     description: 'video menu description',
   },
+  videoMenuDisabled: {
+    id: 'app.video.videoMenuDisabled',
+    description: 'video menu label',
+  },
 });
 
 
@@ -32,6 +36,7 @@ const JoinVideoOptions = ({
   intl,
   isSharingVideo,
   videoItems,
+  videoShareAllowed,
 }) => {
   const menuItems = videoItems
     .filter(item => !item.disabled)
@@ -54,8 +59,11 @@ const JoinVideoOptions = ({
     >
       <DropdownTrigger tabIndex={0}>
         <Button
+          label={!videoShareAllowed ?
+            intl.formatMessage(intlMessages.videoMenuDisabled)
+            : intl.formatMessage(intlMessages.videoMenu)
+          }
           className={styles.button}
-          label={intl.formatMessage(intlMessages.videoMenu)}
           onClick={() => null}
           hideLabel
           aria-label={intl.formatMessage(intlMessages.videoMenuDesc)}
@@ -63,6 +71,7 @@ const JoinVideoOptions = ({
           icon={isSharingVideo ? 'video_off' : 'video'}
           size="lg"
           circle
+          disabled={!videoShareAllowed}
         />
       </DropdownTrigger>
       <DropdownContent placement="top" >
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
index 99c3ee854ebd2f52c0e082d65d27a18501fc1640..b90d262dcf1313b686b9c0e40a253a100aa85fb9 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
@@ -33,7 +33,6 @@ const JoinVideoOptionsContainer = (props) => {
     intl,
     ...restProps
   } = props;
-
   const videoItems = [
     {
       iconPath: `${baseName}/resources/images/video-menu/icon-swap.svg`,
@@ -54,15 +53,9 @@ const JoinVideoOptionsContainer = (props) => {
   return <JoinVideoOptions {...{ videoItems, isSharingVideo, ...restProps }} />;
 };
 
-export default injectIntl(withTracker(({
-  intl,
-  handleJoinVideo,
-  handleCloseVideo,
-}) => ({
+export default injectIntl(withTracker(() => ({
   baseName: VideoMenuService.baseName,
   isSharingVideo: VideoMenuService.isSharingVideo(),
   isDisabled: VideoMenuService.isDisabled(),
-  handleJoinVideo,
-  handleCloseVideo,
-  intl,
+  videoShareAllowed: VideoMenuService.videoShareAllowed(),
 }))(JoinVideoOptionsContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/service.js b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/service.js
index 3ff6a88aba1633cedfc5df7276c0cb142e3bd168..3caaa35c61f4ab09bfcf82e01418622c80f74776 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/service.js
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/service.js
@@ -12,12 +12,13 @@ const isSharingVideo = () => {
   return !!user.has_stream;
 };
 
+const videoShareAllowed = () => Settings.dataSaving.viewParticipantsWebcams;
+
+
 const isDisabled = () => {
   const isWaitingResponse = VideoService.isWaitingResponse();
   const isConnected = VideoService.isConnected();
 
-  const videoSettings = Settings.dataSaving;
-  const enableShare = videoSettings.viewParticipantsWebcams;
   const lockCam = VideoService.isLocked();
 
   const user = Users.findOne({ userId: Auth.userID });
@@ -25,17 +26,17 @@ const isDisabled = () => {
 
   const isConnecting = (!isSharingVideo && isConnected);
 
-
   const isLocked = (lockCam && userLocked);
 
   return isLocked
       || isWaitingResponse
       || isConnecting
-      || !enableShare;
+      || !videoShareAllowed();
 };
 
 export default {
   isSharingVideo,
   isDisabled,
   baseName,
+  videoShareAllowed,
 };
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index f52fe19a623a50c829007f47c812858c29cc6f20..3b2cbd4f46c987039a27fdee39da740dadea386a 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -300,6 +300,7 @@
     "app.video.swapCam": "Swap",
     "app.video.swapCamDesc": "swap the direction of webcams",
     "app.video.videoMenu": "Video menu",
+    "app.video.videoMenuDisabled": "Video menu Webcam is disabled in Settings",
     "app.video.videoMenuDesc": "Open video menu dropdown",
     "app.video.chromeExtensionError": "You must install",
     "app.video.chromeExtensionErrorLink": "this Chrome Extension",