diff --git a/TFTSerial.cpp b/TFTSerial.cpp
index 0bc87a2..0b483b3 100644
--- a/TFTSerial.cpp
+++ b/TFTSerial.cpp
@@ -190,7 +190,7 @@ void CTFTSerial::writeFusion(const char* source, const char* dest)
 	assert(dest != NULL);
 
 	char text[30U];
-	::sprintf(text, "%s -> %s", source, dest);
+	::sprintf(text, "%10.10s -> %10.10s", source, dest);
 
 	gotoPosText(0U, 8U);
 	displayText(text);
diff --git a/YSFControl.cpp b/YSFControl.cpp
index e1bbf27..cc6a17e 100644
--- a/YSFControl.cpp
+++ b/YSFControl.cpp
@@ -152,7 +152,7 @@ bool CYSFControl::writeModem(unsigned char *data)
 			bool change = false;
 
 			if (cm == 0x00U && m_dest == NULL) {
-				m_dest = (unsigned char*)"CQCQCQ";
+				m_dest = (unsigned char*)"CQCQCQ    ";
 				change = true;
 			}
 
@@ -169,16 +169,20 @@ bool CYSFControl::writeModem(unsigned char *data)
 			}
 
 			if (change) {
-				if (m_source != NULL && m_dest != NULL)
+				if (m_source != NULL && m_dest != NULL) {
 					m_display->writeFusion((char*)m_source, (char*)m_dest);
-				if (m_source != NULL && m_dest == NULL)
-					m_display->writeFusion((char*)m_source, "??????");
-				if (m_source == NULL && m_dest != NULL)
-					m_display->writeFusion("??????", (char*)m_dest);
+					LogMessage("YSF, received transmission from %10.10s to %10.10s", m_source, m_dest);
+				}
+				if (m_source != NULL && m_dest == NULL) {
+					m_display->writeFusion((char*)m_source, "??????????");
+					LogMessage("YSF, received transmission from %10.10s to ??????????", m_source);
+				}
+				if (m_source == NULL && m_dest != NULL) {
+					m_display->writeFusion("??????????", (char*)m_dest);
+					LogMessage("YSF, received transmission from ?????????? to %10.10s", m_dest);
+				}
 			}
 		} else {
-			LogMessage("YSF, invalid FICH");
-
 			// Reconstruct FICH based on the last valid frame
 			m_fich.setFI(0x01U);		// Communication channel
 		}