Merge branch 'master' into reactions

resources/qml/delegates/Pill.qml

@@ -8,11 +8,11 @@ Label {
 	color: colors.brightText
 	horizontalAlignment: Text.AlignHCenter
 
-    height: fontMetrics.height * 1.4
-    width: contentWidth * 1.2
-
+	height: contentHeight * 1.2
+	width: contentWidth * 1.2
 	background: Rectangle {
 		radius: parent.height / 2
 		color: Qt.rgba(userColor.r, userColor.g, userColor.b, 0.2)
 	}
+
 }