diff --git a/client/src/components/FileTransfer/index.js b/client/src/components/FileTransfer/index.js
index 47e0640..f2fa4e0 100644
--- a/client/src/components/FileTransfer/index.js
+++ b/client/src/components/FileTransfer/index.js
@@ -87,6 +87,7 @@ export default class FileTransfer extends Component {
             fileName: fileData.fileName,
             encodedFile: fileData.encodedFile,
             fileType: fileData.fileType,
+            timestamp: Date.now(),
           },
         })
       })
diff --git a/client/src/reducers/activities.js b/client/src/reducers/activities.js
index 930f3dc..d8ae231 100644
--- a/client/src/reducers/activities.js
+++ b/client/src/reducers/activities.js
@@ -66,10 +66,7 @@ const activities = (state = initialState, action) => {
         items: [
           ...state.items,
           {
-            fileName: action.payload.fileName,
-            encodedFile: action.payload.encodedFile,
-            fileType: action.payload.fileType,
-            username: action.payload.username,
+            ...action.payload,
             type: 'SEND_FILE',
           },
         ],
@@ -80,10 +77,7 @@ const activities = (state = initialState, action) => {
         items: [
           ...state.items,
           {
-            encodedFile: action.payload.payload.encodedFile,
-            fileType: action.payload.payload.fileType,
-            fileName: action.payload.payload.fileName,
-            username: action.payload.payload.username,
+            ...action.payload.payload,
             type: 'RECEIVE_FILE',
           },
         ],