diff --git a/app/src/main/java/eu/faircode/email/AdapterMedia.java b/app/src/main/java/eu/faircode/email/AdapterMedia.java
index 46012753e6..6dd189f2a1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMedia.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMedia.java
@@ -232,7 +232,7 @@ public class AdapterMedia extends RecyclerView.Adapter<AdapterMedia.ViewHolder>
                                     BinaryBitmap bBitmap = new BinaryBitmap(new HybridBinarizer(source));
                                     MultiFormatReader reader = new MultiFormatReader();
                                     Result result = reader.decode(bBitmap);
-                                    args.putString("barcode_text", result.getText());
+                                    args.putString("barcode_text", Helper.getPrintableString(result.getText()));
                                     args.putString("barcode_format", result.getBarcodeFormat().name());
                                 } catch (NotFoundException ex) {
                                     Log.w(ex);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 311043f7ef..a7f5f3c1bc 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -2186,6 +2186,8 @@ public class Helper {
     // https://issuetracker.google.com/issues/37054851
 
     static String getPrintableString(String value) {
+        if (TextUtils.isEmpty(value))
+            return value;
         StringBuilder result = new StringBuilder();
         for (int i = 0; i < value.length(); i++) {
             char kar = value.charAt(i);