diff --git a/pkg/connector/ids/media.go b/pkg/connector/ids/media.go
index 70083212..31b4e847 100644
--- a/pkg/connector/ids/media.go
+++ b/pkg/connector/ids/media.go
@@ -48,7 +48,6 @@ func ParseDirectMediaInfo(mediaID networkid.MediaID) (info DirectMediaInfo, err
 		err = fmt.Errorf("invalid media ID")
 		return
 	}
-	fmt.Printf("%v\n", mediaID)
 	info.PeerType, err = PeerTypeFromByte(mediaID[1])
 	if err != nil {
 		return
diff --git a/pkg/connector/media/download.go b/pkg/connector/media/download.go
index a3626aba..b61e82c4 100644
--- a/pkg/connector/media/download.go
+++ b/pkg/connector/media/download.go
@@ -53,7 +53,7 @@ func DownloadPhoto(ctx context.Context, client downloader.Client, media *tg.Mess
 		ThumbSize:     largest.GetType(),
 	}
 
-	// TODO convert to streaming
+	// TODO convert to streaming?
 	var buf bytes.Buffer
 	storageFileTypeClass, err := downloader.NewDownloader().Download(client, &file).Stream(ctx, &buf)
 	if err != nil {
diff --git a/pkg/connector/msgconv/tomatrix.go b/pkg/connector/msgconv/tomatrix.go
index 4b70e713..e9fd37e4 100644
--- a/pkg/connector/msgconv/tomatrix.go
+++ b/pkg/connector/msgconv/tomatrix.go
@@ -3,11 +3,13 @@ package msgconv
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/gotd/td/tg"
 	"github.com/rs/zerolog"
 	"go.mau.fi/util/exmime"
 	"maunium.net/go/mautrix/bridgev2"
+	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
@@ -61,9 +63,12 @@ func (mc *MessageConverter) ToMatrix(ctx context.Context, portal *bridgev2.Porta
 				if err != nil {
 					return nil, err
 				}
-				if _, ok := media.GetTTLSeconds(); ok {
-					// TODO set the ttl on the converted message
+				if ttl, ok := media.GetTTLSeconds(); ok {
 					filename = "disappearing_image" + exmime.ExtensionFromMimetype(mimeType)
+					cm.Disappear = database.DisappearingSetting{
+						Type:  database.DisappearingTypeAfterSend,
+						Timer: time.Duration(ttl) * time.Second,
+					}
 				} else {
 					filename = "image" + exmime.ExtensionFromMimetype(mimeType)
 				}