Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	view/nl/messages.po
	view/nl/strings.php

view/theme/redbasic/css/style.css

@@ -1559,6 +1559,11 @@ th,td {
 	padding: 3px;
 }
 
+#channels > tbody > tr > td, #users > tbody > tr > td {
+	max-width: 19.4em;
+	overflow: hidden;
+}
+	
 /* message */
 
 img.mail-list-sender-photo {
@@ -2003,7 +2008,6 @@ nav .badge.mail-update:hover {
 .dropdown-menu {
 	font-size: $body_font_size;
 	border-radius: $radiuspx;
-	max-width: 100%;
 }
 
 .dropdown-menu img {