diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index e7885ca3..0dfbcd70 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -159,6 +159,11 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 		}
 		// check if we have files to upload (from slack, telegram or mattermost)
 		if len(msg.Extra["file"]) > 0 {
+			if b.GetBool("AnnounceFileSender") {
+				if _, msgErr := b.sendMessage(chatid, topicid, msg.Username, "", parentID); msgErr != nil {
+					b.Log.Errorf("sendMessage failed: %s", msgErr)
+				}
+			}
 			return b.handleUploadFile(&msg, chatid, topicid, parentID)
 		}
 	}
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 0665a599..e5de6924 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -1088,6 +1088,10 @@ ShowTopicChange=false
 #OPTIONAL (default false)
 PreserveThreading=false
 
+#Send an extra message indicating the sender for files.
+#OPTIONAL (default false)
+AnnounceFileSender=false
+
 ###################################################################
 #rocketchat section
 ###################################################################