diff --git a/src/cheogram/res/layout/command_result_field.xml b/src/cheogram/res/layout/command_result_field.xml
index 5ba54c0e3b69af98d539697ca0e88ca8f818a242..8ef108f048adb05c30f2edf8ed2fa267ad6621ab 100644
--- a/src/cheogram/res/layout/command_result_field.xml
+++ b/src/cheogram/res/layout/command_result_field.xml
@@ -28,5 +28,14 @@
android:divider="@android:color/transparent"
android:dividerHeight="0dp">
+
+
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 5abb0d16fc0fe4aa1930ee9ae36aee476494d8b9..1ca3c5b3ec70185a527522866fefb5382941bd86 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1343,8 +1343,20 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public void bind(Element field) {
String label = field.getAttribute("label");
if (label == null) label = field.getAttribute("var");
- if (label == null) label = "";
- binding.label.setText(label);
+ if (label == null) {
+ binding.label.setVisibility(View.GONE);
+ } else {
+ binding.label.setVisibility(View.VISIBLE);
+ binding.label.setText(label);
+ }
+
+ String desc = field.findChildContent("desc", "jabber:x:data");
+ if (desc == null) {
+ binding.desc.setVisibility(View.GONE);
+ } else {
+ binding.desc.setVisibility(View.VISIBLE);
+ binding.desc.setText(desc);
+ }
ArrayAdapter values = new ArrayAdapter(binding.getRoot().getContext(), R.layout.simple_list_item);
for (Element el : field.getChildren()) {