diff --git a/src/message.js b/src/message.js
index 0dccc849..39ba2547 100644
--- a/src/message.js
+++ b/src/message.js
@@ -381,11 +381,15 @@ function fromText(text) {
 /**
  * creates new message object from binary data
  * @param {String} bytes
+ * @param {String} filename
  * @return {module:message~Message} new message object
  * @static
  */
-function fromBinary(bytes) {
+function fromBinary(bytes, filename) {
   var literalDataPacket = new packet.Literal();
+  if (filename) {
+    literalDataPacket.setFilename(filename);
+  }
   literalDataPacket.setBytes(bytes, enums.read(enums.literal, enums.literal.binary));
   var literalDataPacketlist = new packet.List();
   literalDataPacketlist.push(literalDataPacket);
diff --git a/test/general/basic.js b/test/general/basic.js
index b509837e..ef9857ca 100644
--- a/test/general/basic.js
+++ b/test/general/basic.js
@@ -145,7 +145,7 @@ describe('Basic', function() {
 
         // sign and encrypt
         var msg, encrypted;
-        msg = openpgp.message.fromBinary(message);
+        msg = openpgp.message.fromBinary(message, "test.txt");
         msg = msg.sign([privKey]);
         msg = msg.encrypt([pubKey]);
         encrypted = openpgp.armor.encode(openpgp.enums.armor.message, msg.packets.write());